[C::B] Switch to MinGW 7.3

AI/BattleAI/BattleAI.cbp

@@ -16,6 +16,9 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
 			</Target>
@@ -30,6 +33,9 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
 			</Target>
@@ -43,6 +49,9 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_thread$(#boost.libsuffix64)" />
+					<Add option="-lboost_system$(#boost.libsuffix64)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib64)" />
 				</Linker>
 			</Target>
@@ -66,9 +75,6 @@
 			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
-			<Add option="-lboost_thread$(#boost.libsuffix)" />
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lVCMI_lib" />
 			<Add directory="../.." />
 		</Linker>
 		<Unit filename="AttackPossibility.cpp" />

AI/EmptyAI/EmptyAI.cbp

@@ -16,6 +16,8 @@
 					<Add option="-ggdb" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
 			</Target>
@@ -29,6 +31,8 @@
 					<Add option="-O2" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
 			</Target>
@@ -42,6 +46,8 @@
 					<Add option="-ggdb" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_system$(#boost.libsuffix64)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib64)" />
 				</Linker>
 			</Target>
@@ -63,8 +69,6 @@
 			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lVCMI_lib" />
 			<Add directory="../.." />
 		</Linker>
 		<Unit filename="CEmptyAI.cpp" />

AI/FuzzyLite.cbp

@@ -60,7 +60,6 @@
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
 			<Add option="-DFL_CPP11" />
-			<Add option="-DFL_WINDOWS" />
 			<Add directory="FuzzyLite/fuzzylite" />
 		</Compiler>
 		<Unit filename="FuzzyLite/fuzzylite/fl/Benchmark.h" />

AI/StupidAI/StupidAI.cbp

@@ -15,6 +15,10 @@
 				<Compiler>
 					<Add option="-ggdb" />
 				</Compiler>
+				<Linker>
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
+				</Linker>
 			</Target>
 			<Target title="Release-win32">
 				<Option platforms="Windows;" />
@@ -28,6 +32,19 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
+				</Linker>
+			</Target>
+			<Target title="Debug-win64">
+				<Option platforms="Windows;" />
+				<Option output="../StupidAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/x64" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Linker>
+					<Add option="-lboost_system$(#boost.libsuffix64)" />
+					<Add option="-lVCMI_lib" />
 				</Linker>
 			</Target>
 		</Build>
@@ -50,8 +67,6 @@
 			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib32)" />
 			<Add directory="../.." />
 		</Linker>

AI/VCAI/VCAI.cbp

@@ -17,6 +17,10 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="../" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
@@ -33,6 +37,10 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="../" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
@@ -48,6 +56,10 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_system$(#boost.libsuffix64)" />
+					<Add option="-lboost_thread$(#boost.libsuffix64)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix64)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="../" />
 					<Add directory="$(#boost.lib64)" />
 				</Linker>
@@ -75,10 +87,6 @@
 		</Compiler>
 		<Linker>
 			<Add option="-lFuzzyLite" />
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lboost_thread$(#boost.libsuffix)" />
-			<Add option="-lboost_chrono$(#boost.libsuffix)" />
-			<Add option="-lVCMI_lib" />
 			<Add directory="../.." />
 		</Linker>
 		<Unit filename="AIUtility.cpp" />

client/VCMI_client.cbp

@@ -19,6 +19,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_program_options$(#boost.libsuffix32)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#sdl2.lib)" />
 					<Add directory="$(#boost.lib32)" />
 					<Add directory="$(#ffmpeg.lib32)" />
@@ -37,6 +43,12 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add option="-lboost_program_options$(#boost.libsuffix32)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#sdl2.lib)" />
 					<Add directory="$(#boost.lib32)" />
 					<Add directory="$(#ffmpeg.lib32)" />
@@ -54,6 +66,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_program_options$(#boost.libsuffix64)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix64)" />
+					<Add option="-lboost_system$(#boost.libsuffix64)" />
+					<Add option="-lboost_thread$(#boost.libsuffix64)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix64)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#sdl2.lib64)" />
 					<Add directory="$(#boost.lib64)" />
 					<Add directory="$(#ffmpeg.lib64)" />
@@ -75,6 +93,7 @@
 			<Add option="-DBOOST_SYSTEM_NO_DEPRECATED" />
 			<Add option="-D_WIN32_WINNT=0x0501" />
 			<Add option="-D_WIN32" />
+			<Add option="-DBOOST_UUID_RANDOM_PROVIDER_FORCE_WINCRYPT" />
 			<Add directory="../client" />
 			<Add directory="$(#ffmpeg.include)" />
 			<Add directory="$(#sdl2.include)" />
@@ -84,12 +103,7 @@
 			<Add option="-lole32" />
 			<Add option="-loleaut32" />
 			<Add option="-lws2_32" />
-			<Add option="-lboost_program_options$(#boost.libsuffix)" />
-			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lboost_thread$(#boost.libsuffix)" />
-			<Add option="-lboost_chrono$(#boost.libsuffix)" />
-			<Add option="-lVCMI_lib" />
+			<Add option="-ladvapi32" />
 			<Add option="-lavcodec.dll" />
 			<Add option="-lavformat.dll" />
 			<Add option="-lswscale.dll" />

lib/VCMI_lib.cbp

@@ -26,12 +26,12 @@
 					<Add option="-lws2_32" />
 					<Add option="-lz" />
 					<Add option="-lminizip" />
-					<Add option="-lboost_filesystem$(#boost.libsuffix)" />
-					<Add option="-lboost_system$(#boost.libsuffix)" />
-					<Add option="-lboost_thread$(#boost.libsuffix)" />
-					<Add option="-lboost_chrono$(#boost.libsuffix)" />
-					<Add option="-lboost_locale$(#boost.libsuffix)" />
-					<Add option="-lboost_date_time$(#boost.libsuffix)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lboost_locale$(#boost.libsuffix32)" />
+					<Add option="-lboost_date_time$(#boost.libsuffix32)" />
 					<Add option="-liconv" />
 					<Add option="-ldbghelp" />
 					<Add directory="$(#boost.lib32)" />
@@ -57,12 +57,12 @@
 					<Add option="-lws2_32" />
 					<Add option="-lz" />
 					<Add option="-lminizip" />
-					<Add option="-lboost_filesystem$(#boost.libsuffix)" />
-					<Add option="-lboost_system$(#boost.libsuffix)" />
-					<Add option="-lboost_thread$(#boost.libsuffix)" />
-					<Add option="-lboost_chrono$(#boost.libsuffix)" />
-					<Add option="-lboost_locale$(#boost.libsuffix)" />
-					<Add option="-lboost_date_time$(#boost.libsuffix)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lboost_locale$(#boost.libsuffix32)" />
+					<Add option="-lboost_date_time$(#boost.libsuffix32)" />
 					<Add option="-liconv" />
 					<Add directory="$(#boost.lib32)" />
 					<Add directory="$(#sdl2.lib)" />
@@ -88,12 +88,12 @@
 					<Add option="-lws2_32" />
 					<Add option="-lzlib" />
 					<Add option="-lminizip" />
-					<Add option="-lboost_filesystem$(#boost.libsuffix)" />
-					<Add option="-lboost_system$(#boost.libsuffix)" />
-					<Add option="-lboost_thread$(#boost.libsuffix)" />
-					<Add option="-lboost_chrono$(#boost.libsuffix)" />
-					<Add option="-lboost_locale$(#boost.libsuffix)" />
-					<Add option="-lboost_date_time$(#boost.libsuffix)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix64)" />
+					<Add option="-lboost_system$(#boost.libsuffix64)" />
+					<Add option="-lboost_thread$(#boost.libsuffix64)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix64)" />
+					<Add option="-lboost_locale$(#boost.libsuffix64)" />
+					<Add option="-lboost_date_time$(#boost.libsuffix64)" />
 					<Add option="-liconv" />
 					<Add option="-ldbghelp" />
 					<Add directory="$(#boost.lib64)" />
@@ -117,6 +117,7 @@
 			<Add option="-DVCMI_DLL" />
 			<Add option="-DBOOST_THREAD_USE_LIB" />
 			<Add option="-DBOOST_SYSTEM_NO_DEPRECATED" />
+			<Add option="-DBOOST_UUID_RANDOM_PROVIDER_FORCE_WINCRYPT" />
 			<Add option="-D_WIN32_WINNT=0x0501" />
 			<Add option="-D_WIN32" />
 			<Add option="-DVCMI_NO_EXTRA_VERSION" />

scripting/erm/ERM.cbp

@@ -18,6 +18,12 @@
 					<Add option="-ggdb" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_program_options$(#boost.libsuffix32)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
 			</Target>
@@ -33,6 +39,12 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add option="-lboost_program_options$(#boost.libsuffix32)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
 			</Target>
@@ -48,6 +60,12 @@
 					<Add option="-ggdb" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_program_options$(#boost.libsuffix64)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix64)" />
+					<Add option="-lboost_system$(#boost.libsuffix64)" />
+					<Add option="-lboost_thread$(#boost.libsuffix64)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix64)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib64)" />
 				</Linker>
 			</Target>
@@ -68,12 +86,6 @@
 			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
-			<Add option="-lboost_program_options$(#boost.libsuffix)" />
-			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lboost_thread$(#boost.libsuffix)" />
-			<Add option="-lboost_chrono$(#boost.libsuffix)" />
-			<Add option="-lVCMI_lib" />
 			<Add directory="../.." />
 		</Linker>
 		<Unit filename="ERMInterpreter.cpp" />

server/VCMI_server.cbp

@@ -15,10 +15,16 @@
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
 				<Compiler>
-					<Add option="-g" />
 					<Add option="-Og" />
+					<Add option="-g" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_program_options$(#boost.libsuffix32)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
 			</Target>
@@ -36,6 +42,12 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add option="-lboost_program_options$(#boost.libsuffix32)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix32)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
 			</Target>
@@ -53,6 +65,12 @@
 					<Add directory="$(#zlib64.include)" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_program_options$(#boost.libsuffix64)" />
+					<Add option="-lboost_filesystem$(#boost.libsuffix64)" />
+					<Add option="-lboost_system$(#boost.libsuffix64)" />
+					<Add option="-lboost_thread$(#boost.libsuffix64)" />
+					<Add option="-lboost_chrono$(#boost.libsuffix64)" />
+					<Add option="-lVCMI_lib" />
 					<Add directory="$(#boost.lib64)" />
 				</Linker>
 			</Target>
@@ -72,6 +90,7 @@
 			<Add option="-DBOOST_THREAD_USE_LIB" />
 			<Add option="-DBOOST_SYSTEM_NO_DEPRECATED" />
 			<Add option="-D_WIN32" />
+			<Add option="-DBOOST_UUID_RANDOM_PROVIDER_FORCE_WINCRYPT" />
 			<Add directory="$(#sdl2.include)" />
 			<Add directory="$(#zlib.include)" />
 			<Add directory="../include" />
@@ -80,13 +99,8 @@
 			<Add option="-lole32" />
 			<Add option="-loleaut32" />
 			<Add option="-lws2_32" />
+			<Add option="-ladvapi32" />
 			<Add option="-lmswsock" />
-			<Add option="-lboost_program_options$(#boost.libsuffix)" />
-			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lboost_thread$(#boost.libsuffix)" />
-			<Add option="-lboost_chrono$(#boost.libsuffix)" />
-			<Add option="-lVCMI_lib" />
 			<Add directory="../" />
 		</Linker>
 		<Unit filename="CGameHandler.cpp" />

test/Test.cbp

@@ -20,6 +20,9 @@
 					<Add directory="mock" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_filesystem$(#boost.libsuffix32)" />
+					<Add option="-lboost_system$(#boost.libsuffix32)" />
+					<Add option="-lboost_thread$(#boost.libsuffix32)" />
 					<Add directory="$(#boost.lib32)" />
 				</Linker>
 			</Target>
@@ -36,6 +39,9 @@
 					<Add directory="mock" />
 				</Compiler>
 				<Linker>
+					<Add option="-lboost_filesystem$(#boost.libsuffix64)" />
+					<Add option="-lboost_system$(#boost.libsuffix64)" />
+					<Add option="-lboost_thread$(#boost.libsuffix64)" />
 					<Add directory="$(#boost.lib64)" />
 				</Linker>
 			</Target>
@@ -65,9 +71,6 @@
 		</Compiler>
 		<Linker>
 			<Add option="-lVCMI_lib" />
-			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lboost_thread$(#boost.libsuffix)" />
 			<Add library="../AI/VCAI.dll" />
 			<Add directory="../" />
 		</Linker>