Merge with default
4 files changed, 15 insertions(+), 3 deletions(-)

M .hgtags
M jasm/CMakeLists.txt
M jasm/website/site/index.html
M release.py
M .hgtags +8 -0
@@ 1,1 1,9 @@ 
 f7c4f5b70ca566d72c662a10379652cb359c31eb version_1.22
+7c0ef7aebb5f7af9ec138ecbc04790ce24ac59cb version_1.23
+513779c7449701e5a61dd96cdd4f840678a8690b version_1.24
+e447030ba9feed94c79bde30c4f27bcc632faab4 version_1.25
+b880425ea34c31eb87b52834502cc1f0251a18e6 version_1.26
+fd2e5ddd8245bd2bf536a8314b8e0da74e931fd9 version_1.27
+623723ab9e348d44e09f6abd6a8d27bb2332831a version_1.28
+97c4baa181af787fe7da475556ebc5e4f6d89610 version_1.29
+5a17bdbc9b0761db92c0c7700e7a84617703aa5f version_1.30

          
M jasm/CMakeLists.txt +2 -2
@@ 27,8 27,8 @@ add_executable(jasm ${jasm_src})
 
 if (${MINGW})
 	add_custom_command(TARGET jasm POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libgcc_s_seh-1.dll" $<TARGET_FILE_DIR:jasm>
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libstdc++-6.dll" $<TARGET_FILE_DIR:jasm>
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libgcc_s_seh-1.dll" $<TARGET_FILE_DIR:jasm>
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libstdc++-6.dll" $<TARGET_FILE_DIR:jasm>
 	)
 endif()
 

          
M jasm/website/site/index.html +4 -0
@@ 122,10 122,14 @@ 
 				<ul>
 					<li>
 						<a href="binaries/jasm_1.30_linux64.7z">jAsm 1.30 for 64-bit Linux</a>
+					</li>
+					<li>
 						<a href="binaries/jasm_1.29_linux64.7z">jAsm 1.29 for 64-bit Linux</a>
 					</li>
 					<li>
 						<a href="binaries/jasm_1.30_win64.7z">jAsm 1.30 for 64-bit Windows</a>
+					</li>
+					<li>
 						<a href="binaries/jasm_1.29_win64.7z">jAsm 1.29 for 64-bit Windows</a>
 					</li>
 				</ul>

          
M release.py +1 -1
@@ 55,7 55,7 @@ def build_mingw(version):
 		if error_code != 0:
 			raise Exception("Failed to compress")
 		os.chdir("..")
-		error_code = run(["7z", "a", "../jasm/website/site/binaries/jasm_%s_win64.7z" % version, "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libgcc_s_seh-1.dll", "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libstdc++-6.dll"])
+		error_code = run(["7z", "a", "../jasm/website/site/binaries/jasm_%s_win64.7z" % version, "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libgcc_s_seh-1.dll", "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libstdc++-6.dll"])
 		if error_code != 0:
 			raise Exception("Failed to compress")
 	finally: