games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

+More build target to support both SDL1 and SDL2 builds

Browse Source
This commit is contained in:
AlexVinS 2014-05-25 01:46:33 +04:00
parent bbd0312b45
commit 56c74bc46a
10 changed files with 297 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
AI/BattleAI/BattleAI.cbp
View File

@ -29,6 +29,29 @@
<Add option="-s" />
</Linker>
</Target>
<Target title="Debug-win32-SDL1">
<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 type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
</Target>
<Target title="Release-win32-SDL1">
<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 type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-pedantic" />

24
AI/EmptyAI/EmptyAI.cbp
View File

@ -30,6 +30,30 @@
<Add option="-s" />
</Linker>
</Target>
<Target title="Debug-win32-SDL1">
<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 type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-ggdb" />
</Compiler>
</Target>
<Target title="Release-win32-SDL1">
<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 type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O3" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wextra" />

28
AI/FuzzyLite/FuzzyLite.cbp
View File

@ -34,6 +34,34 @@
<Add option="-s" />
</Linker>
</Target>
<Target title="Debug-win32-SDL1">
<Option platforms="Windows;" />
<Option output="bin/Debug/FuzzyLite" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="obj/Debug/" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-g" />
</Compiler>
</Target>
<Target title="Release-win32-SDL1">
<Option platforms="Windows;" />
<Option output="bin/Release/FuzzyLite" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="obj/Release/" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wextra" />

24
AI/StupidAI/StupidAI.cbp
View File

@ -30,6 +30,30 @@
<Add option="-s" />
</Linker>
</Target>
<Target title="Debug-win32-SDL1">
<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 type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-ggdb" />
</Compiler>
</Target>
<Target title="Release-win32-SDL1">
<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 type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O3" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-pedantic" />

28
AI/VCAI/VCAI.cbp
View File

@ -34,6 +34,34 @@
<Add directory="../FuzzyLite/bin/Release" />
</Linker>
</Target>
<Target title="Debug-win32-SDL1">
<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 type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="../FuzzyLite/bin/Debug" />
</Linker>
</Target>
<Target title="Release-win32-SDL1">
<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 type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O3" />
</Compiler>
<Linker>
<Add option="-s" />
<Add directory="../FuzzyLite/bin/Release" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-pedantic" />

63
client/VCMI_client.cbp
View File

@ -14,9 +14,17 @@
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-g" />
<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)" />
</Linker>
</Target>
<Target title="Release-win32-SDL2">
<Option platforms="Windows;" />
@ -28,9 +36,56 @@
<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)" />
</Linker>
</Target>
<Target title="Debug-win32-SDL1">
<Option platforms="Windows;" />
<Option output="../VCMI_client" prefix_auto="1" extension_auto="1" />
<Option working_dir="../" />
<Option object_output="../obj/Debug/" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-Og" />
<Add option="-g" />
<Add directory="$(#sdl.include)" />
</Compiler>
<Linker>
<Add option="-lSDL.dll" />
<Add option="-lSDL_image.dll" />
<Add option="-lSDL_mixer.dll" />
<Add option="-lSDL_ttf.dll" />
<Add directory="$(#sdl.lib)" />
</Linker>
</Target>
<Target title="Release-win32-SDL1">
<Option platforms="Windows;" />
<Option output="../VCMI_client" prefix_auto="1" extension_auto="1" />
<Option working_dir="../" />
<Option object_output="../obj/Release/" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
<Add directory="$(#sdl.include)" />
</Compiler>
<Linker>
<Add option="-s" />
<Add option="-lSDL.dll" />
<Add option="-lSDL_image.dll" />
<Add option="-lSDL_mixer.dll" />
<Add option="-lSDL_ttf.dll" />
<Add directory="$(#sdl.lib)" />
</Linker>
</Target>
</Build>
@ -47,7 +102,6 @@
<Add option="-DBOOST_THREAD_USE_LIB" />
<Add option="-D_WIN32_WINNT=0x0501" />
<Add directory="$(#boost.include)" />
<Add directory="$(#sdl2.include)" />
<Add directory="../include" />
<Add directory="../client" />
</Compiler>
@ -60,13 +114,8 @@
<Add option="-lboost_system$(#boost.libsuffix)" />
<Add option="-lboost_thread$(#boost.libsuffix)" />
<Add option="-lboost_chrono$(#boost.libsuffix)" />
<Add option="-lSDL2.dll" />
<Add option="-lSDL2_image.dll" />
<Add option="-lSDL2_mixer.dll" />
<Add option="-lSDL2_ttf.dll" />
<Add option="-lVCMI_lib" />
<Add directory="$(#boost.lib32)" />
<Add directory="$(#sdl2.lib)" />
<Add directory="../" />
</Linker>
<Unit filename="../CCallback.cpp" />

43
lib/VCMI_lib.cbp
View File

@ -19,7 +19,11 @@
<Compiler>
<Add option="-Og" />
<Add option="-g" />
<Add directory="$(#sdl2.include)" />
</Compiler>
<Linker>
<Add directory="$(#sdl2.lib)" />
</Linker>
</Target>
<Target title="Release-win32-SDL2">
<Option platforms="Windows;" />
@ -31,9 +35,46 @@
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
<Add directory="$(#sdl2.include)" />
</Compiler>
<Linker>
<Add option="-s" />
<Add directory="$(#sdl2.lib)" />
</Linker>
</Target>
<Target title="Debug-win32-SDL1">
<Option platforms="Windows;" />
<Option output="../VCMI_lib" prefix_auto="0" extension_auto="1" />
<Option object_output="../obj/Debug/Lib" />
<Option type="3" />
<Option compiler="gcc" />
<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="$(#sdl.include)" />
</Compiler>
<Linker>
<Add directory="$(#sdl.lib)" />
</Linker>
</Target>
<Target title="Release-win32-SDL1">
<Option platforms="Windows;" />
<Option output="../VCMI_lib" prefix_auto="0" extension_auto="1" />
<Option object_output="../obj/Release/Lib" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
<Add directory="$(#sdl.include)" />
</Compiler>
<Linker>
<Add option="-s" />
<Add directory="$(#sdl.lib)" />
</Linker>
</Target>
</Build>
@ -52,7 +93,6 @@
<Add option="-D_WIN32_WINNT=0x0501" />
<Add directory="$(#zlib.include)" />
<Add directory="$(#boost.include)" />
<Add directory="$(#sdl2.include)" />
<Add directory="../include" />
<Add directory="../lib" />
</Compiler>
@ -67,7 +107,6 @@
<Add option="-lboost_locale$(#boost.libsuffix)" />
<Add directory="$(#boost.lib32)" />
<Add directory="$(#zlib.lib)" />
<Add directory="$(#sdl2.lib)" />
<Add directory="../" />
</Linker>
<Unit filename="AI_Base.h" />

29
lib/minizip/minizip.cbp
View File

@ -35,6 +35,35 @@
<Add option="-s" />
</Linker>
</Target>
<Target title="Debug-win32-SDL1">
<Option platforms="Windows;" />
<Option output="../../minizip" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug/" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add option="-DBUILD_DLL" />
</Compiler>
</Target>
<Target title="Release-win32-SDL1">
<Option platforms="Windows;" />
<Option output="../../minizip" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release/" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-DBUILD_DLL" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add directory="$(#zlib.include)" />

34
server/VCMI_server.cbp
View File

@ -14,8 +14,9 @@
<Option compiler="gcc" />
<Option use_console_runner="0" />
<Compiler>
<Add option="-ggdb" />
<Add option="-Og" />
<Add option="-ggdb" />
<Add directory="$(#sdl2.include)" />
</Compiler>
</Target>
<Target title="Release-win32-SDL2">
@ -28,6 +29,36 @@
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
<Add directory="$(#sdl2.include)" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
<Target title="Debug-win32-SDL1">
<Option platforms="Windows;" />
<Option output="../VCMI_server" prefix_auto="1" extension_auto="1" />
<Option object_output="../obj/Debug/Server" />
<Option type="1" />
<Option compiler="gcc" />
<Option use_console_runner="0" />
<Compiler>
<Add option="-Og" />
<Add option="-ggdb" />
<Add directory="$(#sdl.include)" />
</Compiler>
</Target>
<Target title="Release-win32-SDL1">
<Option platforms="Windows;" />
<Option output="../VCMI_server" prefix_auto="1" extension_auto="1" />
<Option object_output="../obj/Release/Server" />
<Option type="1" />
<Option compiler="gcc" />
<Option use_console_runner="0" />
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
<Add directory="$(#sdl.include)" />
</Compiler>
<Linker>
<Add option="-s" />
@ -46,7 +77,6 @@
<Add option="-D_WIN32_WINNT=0x0501" />
<Add option="-DBOOST_THREAD_USE_LIB" />
<Add directory="$(#boost.include)" />
<Add directory="$(#sdl.include)" />
<Add directory="../include" />
</Compiler>
<Linker>

12
test/Test.cbp
View File

@ -18,6 +18,18 @@
<Add option="-g" />
</Compiler>
</Target>
<Target title="Debug-win32-SDL1">
<Option platforms="Windows;" />
<Option output="../Test" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug/" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-march=athlon-xp" />
<Add option="-Wextra" />
<Add option="-g" />
</Compiler>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />