mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	Added debug mingw64 build, minimum Windows version set to windows 7, SDL suffixes removed from Build Tagerts
This commit is contained in:
		| @@ -6,20 +6,23 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../BattleAI" 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/" /> | ||||
| 				<Option object_output="obj/Debug/x86/" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-g" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../BattleAI" 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/Release/" /> | ||||
| 				<Option object_output="obj/Release/x86/" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| @@ -27,6 +30,20 @@ | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add option="-s" /> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Debug-win64"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../BattleAI" 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="gnu_gcc_compiler_x64" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-g" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#boost.lib64)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 		</Build> | ||||
| @@ -46,7 +63,6 @@ | ||||
| 		<Linker> | ||||
| 			<Add option="-lboost_system$(#boost.libsuffix)" /> | ||||
| 			<Add option="-lVCMI_lib" /> | ||||
| 			<Add directory="$(#boost.lib32)" /> | ||||
| 			<Add directory="../.." /> | ||||
| 		</Linker> | ||||
| 		<Unit filename="BattleAI.cpp" /> | ||||
|   | ||||
| @@ -6,25 +6,44 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../EmptyAI" 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/" /> | ||||
| 				<Option object_output="obj/Debug/x86/" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-ggdb" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../EmptyAI" 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/Release/" /> | ||||
| 				<Option object_output="obj/Release/x86/" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-O2" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Debug-win64"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../EmptyAI" 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="gnu_gcc_compiler_x64" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-ggdb" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#boost.lib64)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 		</Build> | ||||
| 		<Compiler> | ||||
| @@ -43,7 +62,6 @@ | ||||
| 		<Linker> | ||||
| 			<Add option="-lboost_system$(#boost.libsuffix)" /> | ||||
| 			<Add option="-lVCMI_lib" /> | ||||
| 			<Add directory="$(#boost.lib32)" /> | ||||
| 			<Add directory="../.." /> | ||||
| 		</Linker> | ||||
| 		<Unit filename="CEmptyAI.cpp" /> | ||||
|   | ||||
| @@ -6,23 +6,24 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="bin/Debug/FuzzyLite" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option output="../FuzzyLite" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option working_dir="" /> | ||||
| 				<Option object_output="obj/Debug/" /> | ||||
| 				<Option object_output="obj/Debug/x86/" /> | ||||
| 				<Option type="2" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Option createDefFile="1" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-g" /> | ||||
| 				</Compiler> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="bin/Release/FuzzyLite" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option output="../FuzzyLite" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option working_dir="" /> | ||||
| 				<Option object_output="obj/Release/" /> | ||||
| 				<Option object_output="obj/Release/x86/" /> | ||||
| 				<Option type="2" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Option createDefFile="1" /> | ||||
| @@ -34,6 +35,19 @@ | ||||
| 					<Add option="-s" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Debug-win64"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../FuzzyLite" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option working_dir="" /> | ||||
| 				<Option object_output="obj/Debug/x64/" /> | ||||
| 				<Option type="2" /> | ||||
| 				<Option compiler="gnu_gcc_compiler_x64" /> | ||||
| 				<Option createDefFile="1" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-g" /> | ||||
| 				</Compiler> | ||||
| 			</Target> | ||||
| 		</Build> | ||||
| 		<Compiler> | ||||
| 			<Add option="-Wextra" /> | ||||
| @@ -46,7 +60,6 @@ | ||||
| 			<Add option="-Wno-overloaded-virtual" /> | ||||
| 			<Add option="-DFL_CPP11" /> | ||||
| 			<Add option="-DFL_WINDOWS" /> | ||||
| 			<Add directory="$(#boost.include)" /> | ||||
| 			<Add directory="fuzzylite" /> | ||||
| 		</Compiler> | ||||
| 		<Unit filename="fuzzylite/fl/Console.h" /> | ||||
|   | ||||
| @@ -6,20 +6,20 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<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/" /> | ||||
| 				<Option object_output="obj/Debug/x86" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-ggdb" /> | ||||
| 				</Compiler> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<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/Release/" /> | ||||
| 				<Option object_output="obj/Release/x86" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
|   | ||||
| @@ -6,23 +6,25 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCAI" 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/" /> | ||||
| 				<Option object_output="obj/Debug/x86" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-g" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="../FuzzyLite/bin/Debug" /> | ||||
| 					<Add directory="../" /> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCAI" 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/Release/" /> | ||||
| 				<Option object_output="obj/Release/x86" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| @@ -31,7 +33,23 @@ | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add option="-s" /> | ||||
| 					<Add directory="../FuzzyLite/bin/Release" /> | ||||
| 					<Add directory="../" /> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Debug-win64"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCAI" 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="gnu_gcc_compiler_x64" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-g" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="../" /> | ||||
| 					<Add directory="$(#boost.lib64)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 		</Build> | ||||
| @@ -46,7 +64,7 @@ | ||||
| 			<Add option="-Wno-unused-parameter" /> | ||||
| 			<Add option="-Wno-overloaded-virtual" /> | ||||
| 			<Add option="-DBOOST_THREAD_USE_LIB" /> | ||||
| 			<Add option="-D_WIN32_WINNT=0x0501" /> | ||||
| 			<Add option="-D_WIN32_WINNT=0x0601" /> | ||||
| 			<Add option="-DFL_CPP11" /> | ||||
| 			<Add directory="$(#boost.include)" /> | ||||
| 			<Add directory="../../include" /> | ||||
| @@ -58,7 +76,6 @@ | ||||
| 			<Add option="-lboost_thread$(#boost.libsuffix)" /> | ||||
| 			<Add option="-lboost_chrono$(#boost.libsuffix)" /> | ||||
| 			<Add option="-lVCMI_lib" /> | ||||
| 			<Add directory="$(#boost.lib32)" /> | ||||
| 			<Add directory="../.." /> | ||||
| 		</Linker> | ||||
| 		<Unit filename="AIUtility.cpp" /> | ||||
|   | ||||
| @@ -6,45 +6,56 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCMI_client" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option working_dir="../" /> | ||||
| 				<Option object_output="../obj/Debug/" /> | ||||
| 				<Option object_output="../obj/Client/Debug/x86" /> | ||||
| 				<Option type="1" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-g" /> | ||||
| 					<Add directory="$(#sdl2.include)" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add option="-lSDL2.dll" /> | ||||
| 					<Add option="-lSDL2_image.dll" /> | ||||
| 					<Add option="-lSDL2_mixer.dll" /> | ||||
| 					<Add option="-lSDL2_ttf.dll" /> | ||||
| 					<Add directory="$(#sdl2.lib)" /> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 					<Add directory="$(#ffmpeg.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCMI_client" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option working_dir="../" /> | ||||
| 				<Option object_output="../obj/Release/" /> | ||||
| 				<Option object_output="../obj/Client/Release/x86" /> | ||||
| 				<Option type="1" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-fomit-frame-pointer" /> | ||||
| 					<Add option="-O2" /> | ||||
| 					<Add directory="$(#sdl2.include)" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add option="-s" /> | ||||
| 					<Add option="-lSDL2.dll" /> | ||||
| 					<Add option="-lSDL2_image.dll" /> | ||||
| 					<Add option="-lSDL2_mixer.dll" /> | ||||
| 					<Add option="-lSDL2_ttf.dll" /> | ||||
| 					<Add directory="$(#sdl2.lib)" /> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 					<Add directory="$(#ffmpeg.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Debug-win64"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCMI_client" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option working_dir="../" /> | ||||
| 				<Option object_output="../obj/Client/Debug/x64" /> | ||||
| 				<Option type="1" /> | ||||
| 				<Option compiler="gnu_gcc_compiler_x64" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-g" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#sdl2.lib64)" /> | ||||
| 					<Add directory="$(#boost.lib64)" /> | ||||
| 					<Add directory="$(#ffmpeg.lib64)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 		</Build> | ||||
| @@ -59,11 +70,12 @@ | ||||
| 			<Add option="-Wno-overloaded-virtual" /> | ||||
| 			<Add option="-fpermissive" /> | ||||
| 			<Add option="-DBOOST_THREAD_USE_LIB" /> | ||||
| 			<Add option="-D_WIN32_WINNT=0x0501" /> | ||||
| 			<Add option="-D_WIN32_WINNT=0x0601" /> | ||||
| 			<Add directory="$(#boost.include)" /> | ||||
| 			<Add directory="../include" /> | ||||
| 			<Add directory="../client" /> | ||||
| 			<Add directory="$(#ffmpeg.include)" /> | ||||
| 			<Add directory="$(#sdl2.include)" /> | ||||
| 		</Compiler> | ||||
| 		<Linker> | ||||
| 			<Add option="-lole32" /> | ||||
| @@ -79,9 +91,11 @@ | ||||
| 			<Add option="-lavformat.dll" /> | ||||
| 			<Add option="-lswscale.dll" /> | ||||
| 			<Add option="-lavutil.dll" /> | ||||
| 			<Add directory="$(#boost.lib32)" /> | ||||
| 			<Add option="-lSDL2.dll" /> | ||||
| 			<Add option="-lSDL2_image.dll" /> | ||||
| 			<Add option="-lSDL2_mixer.dll" /> | ||||
| 			<Add option="-lSDL2_ttf.dll" /> | ||||
| 			<Add directory="../" /> | ||||
| 			<Add directory="$(#ffmpeg.lib)" /> | ||||
| 		</Linker> | ||||
| 		<Unit filename="../CCallback.cpp" /> | ||||
| 		<Unit filename="../CCallback.h" /> | ||||
|   | ||||
| @@ -7,10 +7,10 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCMI_lib" prefix_auto="0" extension_auto="1" /> | ||||
| 				<Option object_output="../obj/Debug/Lib" /> | ||||
| 				<Option object_output="../obj/Lib/Debug/x86" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Option host_application="D:/projects/vcmi/engine/VCMI_client.exe" /> | ||||
| @@ -19,27 +19,76 @@ | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-g" /> | ||||
| 					<Add directory="$(#sdl2.include)" /> | ||||
| 					<Add directory="$(#zlib.include)" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<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 directory="$(#sdl2.lib)" /> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 					<Add directory="$(#zlib.lib)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCMI_lib" prefix_auto="0" extension_auto="1" /> | ||||
| 				<Option object_output="../obj/Release/Lib" /> | ||||
| 				<Option object_output="../obj/Lib/Release/x86" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Option createStaticLib="1" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-fomit-frame-pointer" /> | ||||
| 					<Add option="-O2" /> | ||||
| 					<Add directory="$(#sdl2.include)" /> | ||||
| 					<Add directory="$(#zlib.include)" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add option="-s" /> | ||||
| 					<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 directory="$(#sdl2.lib)" /> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 					<Add directory="$(#zlib.lib)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Debug-win64"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCMI_lib" prefix_auto="0" extension_auto="1" /> | ||||
| 				<Option object_output="../obj/Lib/Debug/x64" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gnu_gcc_compiler_x64" /> | ||||
| 				<Option host_application="D:/projects/vcmi/engine/VCMI_client.exe" /> | ||||
| 				<Option run_host_application_in_terminal="1" /> | ||||
| 				<Option createStaticLib="1" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-g" /> | ||||
| 					<Add directory="$(#zlib64.include)" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<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="-liconv" /> | ||||
| 					<Add directory="$(#sdl2.lib64)" /> | ||||
| 					<Add directory="$(#boost.lib64)" /> | ||||
| 					<Add directory="$(#zlib64.lib)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 		</Build> | ||||
| @@ -56,22 +105,12 @@ | ||||
| 			<Add option="-DVCMI_DLL" /> | ||||
| 			<Add option="-DBOOST_THREAD_USE_LIB" /> | ||||
| 			<Add option="-D_WIN32_WINNT=0x0501" /> | ||||
| 			<Add directory="$(#zlib.include)" /> | ||||
| 			<Add directory="$(#boost.include)" /> | ||||
| 			<Add directory="../include" /> | ||||
| 			<Add directory="../lib" /> | ||||
| 			<Add directory="$(#sdl2.include)" /> | ||||
| 		</Compiler> | ||||
| 		<Linker> | ||||
| 			<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 directory="$(#boost.lib32)" /> | ||||
| 			<Add directory="$(#zlib.lib)" /> | ||||
| 			<Add directory="../" /> | ||||
| 		</Linker> | ||||
| 		<Unit filename="AI_Base.h" /> | ||||
| @@ -151,6 +190,7 @@ | ||||
| 		<Unit filename="StartInfo.h" /> | ||||
| 		<Unit filename="StdInc.h"> | ||||
| 			<Option weight="0" /> | ||||
| 			<Option target="Debug-win64" /> | ||||
| 		</Unit> | ||||
| 		<Unit filename="StringConstants.h" /> | ||||
| 		<Unit filename="UnlockGuard.h" /> | ||||
|   | ||||
| @@ -6,10 +6,10 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../../minizip" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option object_output="obj/Debug/" /> | ||||
| 				<Option object_output="../../obj/minizip/Debug/x86" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Option createStaticLib="1" /> | ||||
| @@ -18,11 +18,14 @@ | ||||
| 					<Add option="-g" /> | ||||
| 					<Add option="-DBUILD_DLL" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#zlib.lib)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../../minizip" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option object_output="obj/Release/" /> | ||||
| 				<Option object_output="../../obj/minizip/Release/x86" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Option createStaticLib="1" /> | ||||
| @@ -33,6 +36,24 @@ | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add option="-s" /> | ||||
| 					<Add directory="$(#zlib.lib)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Debug-win64"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../../minizip" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option object_output="../../obj/minizip/Debug/x64" /> | ||||
| 				<Option type="3" /> | ||||
| 				<Option compiler="gnu_gcc_compiler_x64" /> | ||||
| 				<Option createStaticLib="1" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-Wall" /> | ||||
| 					<Add option="-g" /> | ||||
| 					<Add option="-DBUILD_DLL" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#zlib64.lib)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 		</Build> | ||||
| @@ -41,7 +62,6 @@ | ||||
| 		</Compiler> | ||||
| 		<Linker> | ||||
| 			<Add option="-lz" /> | ||||
| 			<Add directory="$(#zlib.lib)" /> | ||||
| 		</Linker> | ||||
| 		<Unit filename="ioapi.c"> | ||||
| 			<Option compilerVar="CC" /> | ||||
|   | ||||
| @@ -6,7 +6,7 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option output="../ERM" 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/" /> | ||||
| 				<Option type="3" /> | ||||
| @@ -16,7 +16,7 @@ | ||||
| 					<Add option="-ggdb" /> | ||||
| 				</Compiler> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<Option output="../ERM" 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/Release/" /> | ||||
| 				<Option type="3" /> | ||||
|   | ||||
| @@ -6,7 +6,7 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCMI_server" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option object_output="../obj/Debug/Server" /> | ||||
| @@ -16,10 +16,13 @@ | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-ggdb" /> | ||||
| 					<Add directory="$(#sdl2.include)" /> | ||||
| 					<Add directory="$(#zlib.include)" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Release-win32-SDL2"> | ||||
| 			<Target title="Release-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCMI_server" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option object_output="../obj/Release/Server" /> | ||||
| @@ -29,10 +32,27 @@ | ||||
| 				<Compiler> | ||||
| 					<Add option="-fomit-frame-pointer" /> | ||||
| 					<Add option="-O2" /> | ||||
| 					<Add directory="$(#sdl2.include)" /> | ||||
| 					<Add directory="$(#zlib.include)" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add option="-s" /> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Debug-win64"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../VCMI_server" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option object_output="../obj/Debug/Server" /> | ||||
| 				<Option type="1" /> | ||||
| 				<Option compiler="gnu_gcc_compiler_x64" /> | ||||
| 				<Option use_console_runner="0" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-ggdb" /> | ||||
| 					<Add directory="$(#zlib64.include)" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#boost.lib64)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 		</Build> | ||||
| @@ -45,11 +65,11 @@ | ||||
| 			<Add option="-Wno-sign-compare" /> | ||||
| 			<Add option="-Wno-unused-parameter" /> | ||||
| 			<Add option="-Wno-overloaded-virtual" /> | ||||
| 			<Add option="-D_WIN32_WINNT=0x0501" /> | ||||
| 			<Add option="-D_WIN32_WINNT=0x0601" /> | ||||
| 			<Add option="-DBOOST_THREAD_USE_LIB" /> | ||||
| 			<Add directory="$(#zlib.include)" /> | ||||
| 			<Add directory="$(#boost.include)" /> | ||||
| 			<Add directory="../include" /> | ||||
| 			<Add directory="$(#sdl2.include)" /> | ||||
| 		</Compiler> | ||||
| 		<Linker> | ||||
| 			<Add option="-lole32" /> | ||||
| @@ -62,7 +82,6 @@ | ||||
| 			<Add option="-lboost_thread$(#boost.libsuffix)" /> | ||||
| 			<Add option="-lboost_chrono$(#boost.libsuffix)" /> | ||||
| 			<Add option="-lVCMI_lib" /> | ||||
| 			<Add directory="$(#boost.lib32)" /> | ||||
| 			<Add directory="../" /> | ||||
| 		</Linker> | ||||
| 		<Unit filename="CGameHandler.cpp" /> | ||||
|   | ||||
| @@ -6,17 +6,35 @@ | ||||
| 		<Option pch_mode="2" /> | ||||
| 		<Option compiler="gcc" /> | ||||
| 		<Build> | ||||
| 			<Target title="Debug-win32-SDL2"> | ||||
| 			<Target title="Debug-win32"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../Test" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option object_output="obj/Debug/" /> | ||||
| 				<Option object_output="obj/Debug/x86/" /> | ||||
| 				<Option type="1" /> | ||||
| 				<Option compiler="gcc" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-march=athlon-xp" /> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-Wextra" /> | ||||
| 					<Add option="-g" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#boost.lib32)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 			<Target title="Debug-win64"> | ||||
| 				<Option platforms="Windows;" /> | ||||
| 				<Option output="../Test" prefix_auto="1" extension_auto="1" /> | ||||
| 				<Option object_output="obj/Debug/x64/" /> | ||||
| 				<Option type="1" /> | ||||
| 				<Option compiler="gnu_gcc_compiler_x64" /> | ||||
| 				<Compiler> | ||||
| 					<Add option="-Og" /> | ||||
| 					<Add option="-Wextra" /> | ||||
| 					<Add option="-g" /> | ||||
| 				</Compiler> | ||||
| 				<Linker> | ||||
| 					<Add directory="$(#boost.lib64)" /> | ||||
| 				</Linker> | ||||
| 			</Target> | ||||
| 		</Build> | ||||
| 		<Compiler> | ||||
| @@ -36,7 +54,6 @@ | ||||
| 			<Add option="-lboost_test_exec_monitor$(#boost.libsuffix)" /> | ||||
| 			<Add option="-lboost_unit_test_framework$(#boost.libsuffix)" /> | ||||
| 			<Add option="-lboost_filesystem$(#boost.libsuffix)" /> | ||||
| 			<Add directory="$(#boost.lib32)" /> | ||||
| 			<Add directory="../" /> | ||||
| 		</Linker> | ||||
| 		<Unit filename="CMapEditManagerTest.cpp" /> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user