- changes so map editor compiles in mingw
This commit is contained in:
Mark Vejvoda
parent
20562c4dbb
commit
7341886b11
|
|
@ -255,34 +255,27 @@
|
|||
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release_NO_STREFLOP Win32">
|
||||
<Option output="glest_game" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="Release_NO_STREFLOP Win32" />
|
||||
<Target title="Release Linux">
|
||||
<Option output="../linux/glest.bin" prefix_auto="0" extension_auto="0" />
|
||||
<Option object_output="Release Linux/glest_game" />
|
||||
<Option type="1" />
|
||||
<Option compiler="mingw32_compiler" />
|
||||
<Option compiler="gcc" />
|
||||
<Option use_console_runner="0" />
|
||||
<Compiler>
|
||||
<Add option="/DWIN32" />
|
||||
<Add option="/DNDEBUG" />
|
||||
<Add option="/D_WINDOWS" />
|
||||
<Add option="/DXML_LIBRARY" />
|
||||
<Add option="/DUSE_PCH=1" />
|
||||
<Add option="/D_CRT_SECURE_NO_WARNINGS" />
|
||||
<Add option="/DSTREFLOP_SSE" />
|
||||
<Add option="/DLIBM_COMPILING_FLT32" />
|
||||
<Add option="/DCURL_STATICLIB" />
|
||||
<Add option="/W2" />
|
||||
<Add option="/Zi" />
|
||||
<Add option="/O2" />
|
||||
<Add option="/MT" />
|
||||
<Add option="/arch:SSE2" />
|
||||
<Add directory="../../../deps/include/lua" />
|
||||
<Add directory="../../../deps/include" />
|
||||
<Add option="-O2" />
|
||||
<Add option="-fno-strict-aliasing" />
|
||||
<Add option="-frounding-math" />
|
||||
<Add option="-fsignaling-nans" />
|
||||
<Add option="-mfpmath=sse -msse" />
|
||||
<Add option="-DNDEBUG" />
|
||||
<Add option="-DUSE_STREFLOP" />
|
||||
<Add option="-DSTREFLOP_SSE" />
|
||||
<Add option="-DLIBM_COMPILING_FLT32" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
<Add directory="../../source/shared_lib/include/platform" />
|
||||
<Add directory="../../source/shared_lib/include/platform/win32" />
|
||||
<Add directory="../../source/shared_lib/include/platform/posix" />
|
||||
<Add directory="../../source/shared_lib/include/sound" />
|
||||
<Add directory="../../source/shared_lib/include/sound/ds8" />
|
||||
<Add directory="../../source/shared_lib/include/util" />
|
||||
<Add directory="../../source/shared_lib/include/lua" />
|
||||
<Add directory="../../source/shared_lib/include/xml" />
|
||||
|
|
@ -300,28 +293,19 @@
|
|||
<Add directory="../../source/glest_game/type_instances" />
|
||||
<Add directory="../../source/glest_game/types" />
|
||||
<Add directory="../../source/glest_game/world" />
|
||||
<Add directory="../../source/win32_deps/include" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-3.0.1/src" />
|
||||
<Add directory="../../source/win32_deps/SDL-1.2.x/include" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/shared_lib/include/sound/openal" />
|
||||
<Add directory="../../source/win32_deps/openal-soft-1.12.854/include" />
|
||||
<Add directory="../../source/shared_lib/include/platform/posix" />
|
||||
<Add directory="../../source/shared_lib/include/streflop" />
|
||||
<Add directory="../../source/shared_lib/include/platform/common" />
|
||||
<Add directory="../../source/win32_deps/curl-7.20.1/include" />
|
||||
<Add directory="../../source/shared_lib/include/map" />
|
||||
<Add directory="$(NOINHERIT)" />
|
||||
<Add directory="$(THIRDPARTY_INCLUDE_DIR)/SDL" />
|
||||
<Add directory="$(THIRDPARTY_INCLUDE_DIR)/lua5.1" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="../../../deps/include/lua" />
|
||||
<Add directory="../../../deps/include" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
<Add directory="../../source/shared_lib/include/platform" />
|
||||
<Add directory="../../source/shared_lib/include/platform/win32" />
|
||||
<Add directory="../../source/shared_lib/include/sound" />
|
||||
<Add directory="../../source/shared_lib/include/sound/ds8" />
|
||||
<Add directory="../../source/shared_lib/include/util" />
|
||||
<Add directory="../../source/shared_lib/include/lua" />
|
||||
<Add directory="../../source/shared_lib/include/xml" />
|
||||
|
|
@ -339,49 +323,136 @@
|
|||
<Add directory="../../source/glest_game/type_instances" />
|
||||
<Add directory="../../source/glest_game/types" />
|
||||
<Add directory="../../source/glest_game/world" />
|
||||
<Add directory="../../source/win32_deps/include" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-3.0.1/src" />
|
||||
<Add directory="../../source/win32_deps/SDL-1.2.x/include" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/shared_lib/include/sound/openal" />
|
||||
<Add directory="../../source/win32_deps/openal-soft-1.12.854/include" />
|
||||
<Add directory="../../source/shared_lib/include/platform/posix" />
|
||||
<Add directory="../../source/shared_lib/include/streflop" />
|
||||
<Add directory="../../source/shared_lib/include/platform/common" />
|
||||
<Add directory="../../source/win32_deps/curl-7.20.1/include" />
|
||||
<Add directory="../../source/shared_lib/include/map" />
|
||||
<Add directory="$(NOINHERIT)" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add option="/INCREMENTAL:NO" />
|
||||
<Add library="dsound" />
|
||||
<Add library="dxguid" />
|
||||
<Add library="ogg_static" />
|
||||
<Add library="vorbis_static" />
|
||||
<Add library="vorbisfile_static" />
|
||||
<Add library="opengl32" />
|
||||
<Add library="glu32" />
|
||||
<Add library="wsock32" />
|
||||
<Add library="libglest" />
|
||||
<Add library="mmc" />
|
||||
<Add library="lua5.1" />
|
||||
<Add library="xerces-c_3" />
|
||||
<Add library="Dbghelp" />
|
||||
<Add library="libpng" />
|
||||
<Add library="ogg" />
|
||||
<Add library="vorbis" />
|
||||
<Add library="vorbisfile" />
|
||||
<Add library="z" />
|
||||
<Add library="jpeg" />
|
||||
<Add library="zlib" />
|
||||
<Add library="sdl" />
|
||||
<Add library="sdlmain" />
|
||||
<Add library="winmm" />
|
||||
<Add library="openal32" />
|
||||
<Add library="iphlpapi" />
|
||||
<Add library="libstreflop" />
|
||||
<Add library="libcurl" />
|
||||
<Add library="ws2_32" />
|
||||
<Add directory="../../source/win32_deps/lib" />
|
||||
<Add directory="../../build/Release_NO_STREFLOP Win32/libglest" />
|
||||
<Add directory="../../source/shared_lib/sources/streflop/libstreflop" />
|
||||
<Add library="png" />
|
||||
<Add library="xerces-c" />
|
||||
<Add library="openal" />
|
||||
<Add library="curl" />
|
||||
<Add library="GL" />
|
||||
<Add library="GLU" />
|
||||
<Add library="SDL" />
|
||||
<Add library="SDLmain" />
|
||||
<Add library="lua5.1" />
|
||||
<Add library="glest" />
|
||||
<Add library="streflop" />
|
||||
<Add directory="../../source/linux_deps/lib" />
|
||||
</Linker>
|
||||
<Environment>
|
||||
<Variable name="THIRDPARTY_INCLUDE_DIR" value="/usr/include" />
|
||||
<Variable name="THIRDPARTY_LIB_DIR" value="/usr/lib" />
|
||||
</Environment>
|
||||
</Target>
|
||||
<Target title="Debug Linux">
|
||||
<Option output="../linux/glest.bin" prefix_auto="0" extension_auto="0" />
|
||||
<Option object_output="Debug Linux/glest_game" />
|
||||
<Option type="1" />
|
||||
<Option compiler="gcc" />
|
||||
<Option use_console_runner="0" />
|
||||
<Compiler>
|
||||
<Add option="-Weffc++" />
|
||||
<Add option="-g" />
|
||||
<Add option="-fno-strict-aliasing" />
|
||||
<Add option="-frounding-math" />
|
||||
<Add option="-fsignaling-nans" />
|
||||
<Add option="-mfpmath=sse -msse" />
|
||||
<Add option="-DDEBUG" />
|
||||
<Add option="-DUSE_STREFLOP" />
|
||||
<Add option="-DSTREFLOP_SSE" />
|
||||
<Add option="-DLIBM_COMPILING_FLT32" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
<Add directory="../../source/shared_lib/include/platform" />
|
||||
<Add directory="../../source/shared_lib/include/platform/posix" />
|
||||
<Add directory="../../source/shared_lib/include/sound" />
|
||||
<Add directory="../../source/shared_lib/include/util" />
|
||||
<Add directory="../../source/shared_lib/include/lua" />
|
||||
<Add directory="../../source/shared_lib/include/xml" />
|
||||
<Add directory="../../source/shared_lib/include/tinyxml" />
|
||||
<Add directory="../../source/glest_game/ai" />
|
||||
<Add directory="../../source/glest_game/facilities" />
|
||||
<Add directory="../../source/glest_game/game" />
|
||||
<Add directory="../../source/glest_game/global" />
|
||||
<Add directory="../../source/glest_game/graphics" />
|
||||
<Add directory="../../source/glest_game/gui" />
|
||||
<Add directory="../../source/glest_game/main" />
|
||||
<Add directory="../../source/glest_game/menu" />
|
||||
<Add directory="../../source/glest_game/network" />
|
||||
<Add directory="../../source/glest_game/sound" />
|
||||
<Add directory="../../source/glest_game/type_instances" />
|
||||
<Add directory="../../source/glest_game/types" />
|
||||
<Add directory="../../source/glest_game/world" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/shared_lib/include/sound/openal" />
|
||||
<Add directory="../../source/shared_lib/include/streflop" />
|
||||
<Add directory="../../source/shared_lib/include/platform/common" />
|
||||
<Add directory="../../source/shared_lib/include/map" />
|
||||
<Add directory="$(THIRDPARTY_INCLUDE_DIR)/SDL" />
|
||||
<Add directory="$(THIRDPARTY_INCLUDE_DIR)/lua5.1" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
<Add directory="../../source/shared_lib/include/platform" />
|
||||
<Add directory="../../source/shared_lib/include/sound" />
|
||||
<Add directory="../../source/shared_lib/include/util" />
|
||||
<Add directory="../../source/shared_lib/include/lua" />
|
||||
<Add directory="../../source/shared_lib/include/xml" />
|
||||
<Add directory="../../source/shared_lib/include/tinyxml" />
|
||||
<Add directory="../../source/glest_game/ai" />
|
||||
<Add directory="../../source/glest_game/facilities" />
|
||||
<Add directory="../../source/glest_game/game" />
|
||||
<Add directory="../../source/glest_game/global" />
|
||||
<Add directory="../../source/glest_game/graphics" />
|
||||
<Add directory="../../source/glest_game/gui" />
|
||||
<Add directory="../../source/glest_game/main" />
|
||||
<Add directory="../../source/glest_game/menu" />
|
||||
<Add directory="../../source/glest_game/network" />
|
||||
<Add directory="../../source/glest_game/sound" />
|
||||
<Add directory="../../source/glest_game/type_instances" />
|
||||
<Add directory="../../source/glest_game/types" />
|
||||
<Add directory="../../source/glest_game/world" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/shared_lib/include/sound/openal" />
|
||||
<Add directory="../../source/shared_lib/include/platform/posix" />
|
||||
<Add directory="../../source/shared_lib/include/streflop" />
|
||||
<Add directory="../../source/shared_lib/include/platform/common" />
|
||||
<Add directory="../../source/shared_lib/include/map" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add library="ogg" />
|
||||
<Add library="vorbis" />
|
||||
<Add library="vorbisfile" />
|
||||
<Add library="z" />
|
||||
<Add library="jpeg" />
|
||||
<Add library="png" />
|
||||
<Add library="xerces-c" />
|
||||
<Add library="openal" />
|
||||
<Add library="curl" />
|
||||
<Add library="GL" />
|
||||
<Add library="GLU" />
|
||||
<Add library="SDL" />
|
||||
<Add library="SDLmain" />
|
||||
<Add library="lua5.1" />
|
||||
<Add library="glest" />
|
||||
<Add library="streflop" />
|
||||
<Add directory="../../source/linux_deps/lib" />
|
||||
</Linker>
|
||||
<Environment>
|
||||
<Variable name="THIRDPARTY_LIB_DIR" value="/usr/lib" />
|
||||
<Variable name="THIRDPARTY_INCLUDE_DIR" value="/usr/include" />
|
||||
</Environment>
|
||||
</Target>
|
||||
</Build>
|
||||
<Linker>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,34 +1,46 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_layout_file>
|
||||
<ActiveTarget name="Release Win32" />
|
||||
<File name="../../source/glest_game/ai/ai.cpp" open="1" top="0" tabpos="10">
|
||||
<File name="../../source/glest_game/ai/ai.cpp" open="1" top="0" tabpos="9">
|
||||
<Cursor position="12418" topLine="415" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/game/game.cpp" open="1" top="0" tabpos="6">
|
||||
<File name="../../source/glest_game/facilities/game_util.cpp" open="1" top="0" tabpos="10">
|
||||
<Cursor position="4305" topLine="136" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/facilities/game_util.h" open="1" top="0" tabpos="11">
|
||||
<Cursor position="1282" topLine="0" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/game/game.cpp" open="1" top="0" tabpos="5">
|
||||
<Cursor position="17909" topLine="457" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/global/config.cpp" open="1" top="0" tabpos="3">
|
||||
<Cursor position="0" topLine="0" />
|
||||
<File name="../../source/glest_game/global/config.cpp" open="1" top="0" tabpos="2">
|
||||
<Cursor position="2352" topLine="57" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/global/core_data.cpp" open="1" top="0" tabpos="4">
|
||||
<Cursor position="836" topLine="147" />
|
||||
<File name="../../source/glest_game/global/core_data.cpp" open="1" top="0" tabpos="3">
|
||||
<Cursor position="836" topLine="138" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/global/lang.cpp" open="1" top="0" tabpos="5">
|
||||
<File name="../../source/glest_game/global/lang.cpp" open="1" top="0" tabpos="4">
|
||||
<Cursor position="900" topLine="17" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/graphics/renderer.cpp" open="1" top="0" tabpos="8">
|
||||
<File name="../../source/glest_game/graphics/renderer.cpp" open="1" top="0" tabpos="7">
|
||||
<Cursor position="4897" topLine="109" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/main/main.cpp" open="1" top="0" tabpos="2">
|
||||
<Cursor position="34050" topLine="857" />
|
||||
<File name="../../source/glest_game/main/main.cpp" open="1" top="0" tabpos="1">
|
||||
<Cursor position="19940" topLine="590" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/main/program.cpp" open="1" top="0" tabpos="7">
|
||||
<Cursor position="3811" topLine="123" />
|
||||
<File name="../../source/glest_game/main/program.cpp" open="1" top="0" tabpos="6">
|
||||
<Cursor position="16490" topLine="479" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/menu/menu_state_connected_game.cpp" open="1" top="1" tabpos="11">
|
||||
<File name="../../source/glest_game/menu/menu_state_connected_game.cpp" open="0" top="0" tabpos="11">
|
||||
<Cursor position="12506" topLine="308" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/type_instances/unit.cpp" open="1" top="0" tabpos="9">
|
||||
<File name="../../source/glest_game/menu/menu_state_custom_game.cpp" open="1" top="1" tabpos="15">
|
||||
<Cursor position="77903" topLine="1933" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/network/network_manager.cpp" open="1" top="0" tabpos="14">
|
||||
<Cursor position="2716" topLine="42" />
|
||||
</File>
|
||||
<File name="../../source/glest_game/type_instances/unit.cpp" open="1" top="0" tabpos="8">
|
||||
<Cursor position="50789" topLine="1676" />
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,10 @@
|
|||
<Option compiler="mingw32_compiler" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-Weffc++" />
|
||||
<Add option="-Wextra" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="-g" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-D_CRT_SECURE_NO_WARNINGS" />
|
||||
|
|
@ -53,27 +57,34 @@
|
|||
<Add directory="../../source/shared_lib/include/streflop/libm/headers" />
|
||||
</ResourceCompiler>
|
||||
</Target>
|
||||
<Target title="Debug-MT Win32">
|
||||
<Option output="libstreflop" prefix_auto="1" extension_auto="1" />
|
||||
<Target title="Debug Linux">
|
||||
<Option output="../../source/linux_deps/lib/libstreflop.a" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="../../source/win32_deps/lib" />
|
||||
<Option object_output="Debug Linux/libstreflop" />
|
||||
<Option type="2" />
|
||||
<Option compiler="mingw32_compiler" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="/DWIN32" />
|
||||
<Add option="/DNDEBUG" />
|
||||
<Add option="/D_LIB" />
|
||||
<Add option="/D_CRT_SECURE_NO_WARNINGS" />
|
||||
<Add option="/DUSE_PCH=1" />
|
||||
<Add option="/DUSE_STREFLOP" />
|
||||
<Add option="/DSTREFLOP_SSE" />
|
||||
<Add option="/DLIBM_COMPILING_FLT32" />
|
||||
<Add option="/W3" />
|
||||
<Add option="/Zi" />
|
||||
<Add option="/O2" />
|
||||
<Add option="/MT" />
|
||||
<Add option="/arch:SSE2" />
|
||||
<Add option="-Wshadow" />
|
||||
<Add option="-Winit-self" />
|
||||
<Add option="-Wredundant-decls" />
|
||||
<Add option="-Wundef" />
|
||||
<Add option="-Wfloat-equal" />
|
||||
<Add option="-Winline" />
|
||||
<Add option="-Wunreachable-code" />
|
||||
<Add option="-Wmissing-include-dirs" />
|
||||
<Add option="-Weffc++" />
|
||||
<Add option="-Wextra" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="-g" />
|
||||
<Add option="-fno-strict-aliasing" />
|
||||
<Add option="-frounding-math" />
|
||||
<Add option="-fsignaling-nans" />
|
||||
<Add option="-mfpmath=sse -msse" />
|
||||
<Add option="-fPIC" />
|
||||
<Add option="-DUSE_STREFLOP" />
|
||||
<Add option="-DSTREFLOP_SSE" />
|
||||
<Add option="-DLIBM_COMPILING_FLT32" />
|
||||
<Add directory="../../source/shared_lib/include/streflop/libm/flt-32" />
|
||||
<Add directory="../../source/shared_lib/include/streflop/libm/headers" />
|
||||
</Compiler>
|
||||
|
|
@ -82,26 +93,22 @@
|
|||
<Add directory="../../source/shared_lib/include/streflop/libm/headers" />
|
||||
</ResourceCompiler>
|
||||
</Target>
|
||||
<Target title="Release_NO_STREFLOP Win32">
|
||||
<Option output="libstreflop" prefix_auto="1" extension_auto="1" />
|
||||
<Target title="Release Linux">
|
||||
<Option output="../../source/linux_deps/lib/libstreflop.a" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="../../source/win32_deps/lib" />
|
||||
<Option object_output="Release Linux/libstreflop" />
|
||||
<Option type="2" />
|
||||
<Option compiler="mingw32_compiler" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="/DWIN32" />
|
||||
<Add option="/DNDEBUG" />
|
||||
<Add option="/D_LIB" />
|
||||
<Add option="/D_CRT_SECURE_NO_WARNINGS" />
|
||||
<Add option="/DUSE_PCH=1" />
|
||||
<Add option="/DSTREFLOP_SSE" />
|
||||
<Add option="/DLIBM_COMPILING_FLT32" />
|
||||
<Add option="/W3" />
|
||||
<Add option="/Zi" />
|
||||
<Add option="/O2" />
|
||||
<Add option="/MT" />
|
||||
<Add option="/arch:SSE2" />
|
||||
<Add option="-fno-strict-aliasing" />
|
||||
<Add option="-frounding-math" />
|
||||
<Add option="-fsignaling-nans" />
|
||||
<Add option="-mfpmath=sse -msse" />
|
||||
<Add option="-fPIC" />
|
||||
<Add option="-DUSE_STREFLOP" />
|
||||
<Add option="-DSTREFLOP_SSE" />
|
||||
<Add option="-DLIBM_COMPILING_FLT32" />
|
||||
<Add directory="../../source/shared_lib/include/streflop/libm/flt-32" />
|
||||
<Add directory="../../source/shared_lib/include/streflop/libm/headers" />
|
||||
</Compiler>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_layout_file>
|
||||
<ActiveTarget name="Release Win32" />
|
||||
<ActiveTarget name="Debug Win32" />
|
||||
</CodeBlocks_layout_file>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
<Workspace title="Workspace">
|
||||
<Project filename="libstreflop.cbp" />
|
||||
<Project filename="shared_lib.cbp" />
|
||||
<Project filename="glest_game.cbp" active="1" />
|
||||
<Project filename="glest_game.cbp" />
|
||||
<Project filename="glest_editor.cbp" active="1" />
|
||||
</Workspace>
|
||||
</CodeBlocks_workspace_file>
|
||||
|
|
|
|||
|
|
@ -7,94 +7,17 @@
|
|||
<Option compiler="mingw32_compiler" />
|
||||
<Build>
|
||||
<Target title="Debug Win32">
|
||||
<Option output="../../source/win32_deps/lib/libglest.lib" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="Debug Win32/shared_lib" />
|
||||
<Option type="2" />
|
||||
<Option compiler="mingw32_compiler" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-D_DEBUG" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-D_CRT_SECURE_NO_WARNINGS" />
|
||||
<Add option="-DUSE_PCH=1" />
|
||||
<Add option="-DUSE_STREFLOP" />
|
||||
<Add option="-DSTREFLOP_SSE" />
|
||||
<Add option="-DSTREFLOP_RANDOM_GEN_SIZE=32" />
|
||||
<Add option="-DLIBM_COMPILING_FLT32" />
|
||||
<Add option="-DCURL_STATICLIB" />
|
||||
<Add directory="../../source/shared_lib/include" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
<Add directory="../../source/shared_lib/include/platform" />
|
||||
<Add directory="../../source/shared_lib/include/platform/win32" />
|
||||
<Add directory="../../source/shared_lib/include/sound" />
|
||||
<Add directory="../../source/shared_lib/include/sound/ds8" />
|
||||
<Add directory="../../source/shared_lib/include/util" />
|
||||
<Add directory="../../source/shared_lib/include/lua" />
|
||||
<Add directory="../../source/shared_lib/include/xml" />
|
||||
<Add directory="../../source/win32_deps/include" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-3.0.1/src" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude" />
|
||||
<Add directory="../../source/win32_deps/lpng141" />
|
||||
<Add directory="../../source/win32_deps/jpeg-8a" />
|
||||
<Add directory="../../source/win32_deps/SDL-1.2.x/include" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/win32_deps/openal-soft-1.12.854/include" />
|
||||
<Add directory="../../source/shared_lib/include/sound/openal" />
|
||||
<Add directory="../../source/shared_lib/include/platform/posix" />
|
||||
<Add directory="../../source/shared_lib/include/streflop" />
|
||||
<Add directory="../../source/shared_lib/include/streflop/libm_flt32_source" />
|
||||
<Add directory="../../source/shared_lib/include/platform/common" />
|
||||
<Add directory="../../source/win32_deps/curl-7.20.1/include" />
|
||||
<Add directory="../../source/shared_lib/include/map" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="../../source/shared_lib/include" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
<Add directory="../../source/shared_lib/include/platform" />
|
||||
<Add directory="../../source/shared_lib/include/platform/win32" />
|
||||
<Add directory="../../source/shared_lib/include/sound" />
|
||||
<Add directory="../../source/shared_lib/include/sound/ds8" />
|
||||
<Add directory="../../source/shared_lib/include/util" />
|
||||
<Add directory="../../source/shared_lib/include/lua" />
|
||||
<Add directory="../../source/shared_lib/include/xml" />
|
||||
<Add directory="../../source/win32_deps/include" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-3.0.1/src" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude" />
|
||||
<Add directory="../../source/win32_deps/lpng141" />
|
||||
<Add directory="../../source/win32_deps/jpeg-8a" />
|
||||
<Add directory="../../source/win32_deps/SDL-1.2.x/include" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/win32_deps/openal-soft-1.12.854/include" />
|
||||
<Add directory="../../source/shared_lib/include/sound/openal" />
|
||||
<Add directory="../../source/shared_lib/include/platform/posix" />
|
||||
<Add directory="../../source/shared_lib/include/streflop" />
|
||||
<Add directory="../../source/shared_lib/include/streflop/libm_flt32_source" />
|
||||
<Add directory="../../source/shared_lib/include/platform/common" />
|
||||
<Add directory="../../source/win32_deps/curl-7.20.1/include" />
|
||||
<Add directory="../../source/shared_lib/include/map" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add library="libstreflop" />
|
||||
<Add library="libcurl" />
|
||||
<Add directory="./" />
|
||||
<Add directory="../../source/win32_deps/lib" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release Win32">
|
||||
<Option output="../../source/win32_deps/lib/libglest.dll" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="../../source/win32_deps/lib" />
|
||||
<Option object_output="Release Win32/shared_lib" />
|
||||
<Option object_output="Debug Win32/shared_lib" />
|
||||
<Option type="3" />
|
||||
<Option compiler="mingw32_compiler" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-g" />
|
||||
<Add option="-D_WIN32" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-DNDEBUG" />
|
||||
<Add option="-D_DEBUG" />
|
||||
<Add option="-DXML_LIBRARY" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-D_CRT_SECURE_NO_WARNINGS" />
|
||||
|
|
@ -120,7 +43,7 @@
|
|||
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/src" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/include" />
|
||||
<Add directory="../../source/win32_deps/lpng141" />
|
||||
<Add directory="../../source/win32_deps/jpeg-8a" />
|
||||
<Add directory="../../source/win32_deps/jpeg-8b" />
|
||||
<Add directory="../../source/win32_deps/SDL-1.2.x/include" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/win32_deps/openal-soft-1.12.854/include" />
|
||||
|
|
@ -181,30 +104,28 @@
|
|||
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release_NO_STREFLOP Win32">
|
||||
<Option output="lib" prefix_auto="1" extension_auto="1" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="Release_NO_STREFLOP Win32" />
|
||||
<Option type="2" />
|
||||
<Target title="Release Win32">
|
||||
<Option output="../../source/win32_deps/lib/libglest.dll" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="../../source/win32_deps/lib" />
|
||||
<Option object_output="Release Win32/shared_lib" />
|
||||
<Option type="3" />
|
||||
<Option compiler="mingw32_compiler" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="/DWIN32" />
|
||||
<Add option="/DNDEBUG" />
|
||||
<Add option="/D_LIB" />
|
||||
<Add option="/D_CRT_SECURE_NO_WARNINGS" />
|
||||
<Add option="/DUSE_PCH=1" />
|
||||
<Add option="/DSTREFLOP_SSE" />
|
||||
<Add option="/DSTREFLOP_RANDOM_GEN_SIZE=32" />
|
||||
<Add option="/DLIBM_COMPILING_FLT32" />
|
||||
<Add option="/DCURL_STATICLIB" />
|
||||
<Add option="/W3" />
|
||||
<Add option="/Zi" />
|
||||
<Add option="/O2" />
|
||||
<Add option="/MT" />
|
||||
<Add option="/arch:SSE2" />
|
||||
<Add directory="../../../deps/include/lua" />
|
||||
<Add directory="../../../deps/include" />
|
||||
<Add option="-D_WIN32" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-DNDEBUG" />
|
||||
<Add option="-DXML_LIBRARY" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-D_CRT_SECURE_NO_WARNINGS" />
|
||||
<Add option="-DUSE_PCH=1" />
|
||||
<Add option="-DUSE_STREFLOP" />
|
||||
<Add option="-DSTREFLOP_SSE" />
|
||||
<Add option="-DSTREFLOP_RANDOM_GEN_SIZE=32" />
|
||||
<Add option="-DLIBM_COMPILING_FLT32" />
|
||||
<Add option="-DCURL_STATICLIB" />
|
||||
<Add option="-D_STDCALL_SUPPORTED" />
|
||||
<Add option="-D_M_IX86" />
|
||||
<Add directory="../../source/shared_lib/include" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
|
|
@ -216,10 +137,10 @@
|
|||
<Add directory="../../source/shared_lib/include/lua" />
|
||||
<Add directory="../../source/shared_lib/include/xml" />
|
||||
<Add directory="../../source/win32_deps/include" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-3.0.1/src" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/src" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/include" />
|
||||
<Add directory="../../source/win32_deps/lpng141" />
|
||||
<Add directory="../../source/win32_deps/jpeg-8a" />
|
||||
<Add directory="../../source/win32_deps/jpeg-8b" />
|
||||
<Add directory="../../source/win32_deps/SDL-1.2.x/include" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/win32_deps/openal-soft-1.12.854/include" />
|
||||
|
|
@ -232,8 +153,6 @@
|
|||
<Add directory="../../source/shared_lib/include/map" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="../../../deps/include/lua" />
|
||||
<Add directory="../../../deps/include" />
|
||||
<Add directory="../../source/shared_lib/include" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
|
|
@ -262,9 +181,24 @@
|
|||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add library="libstreflop" />
|
||||
<Add library="libcurl" />
|
||||
<Add library="jpeg" />
|
||||
<Add library="lua5.1" />
|
||||
<Add library="liblibpng" />
|
||||
<Add library="SDL" />
|
||||
<Add library="iphlpapi" />
|
||||
<Add library="gdi32" />
|
||||
<Add library="dsound" />
|
||||
<Add library="OpenAL32" />
|
||||
<Add library="liblibcurl" />
|
||||
<Add library="xerces-c" />
|
||||
<Add library="dxguid" />
|
||||
<Add library="liblibogg" />
|
||||
<Add library="liblibvorbis" />
|
||||
<Add library="liblibvorbisfile" />
|
||||
<Add library="liblibvorbisenc" />
|
||||
<Add directory="./" />
|
||||
<Add directory="../../source/win32_deps/lib" />
|
||||
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release Linux">
|
||||
|
|
@ -275,18 +209,16 @@
|
|||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-fno-strict-aliasing" />
|
||||
<Add option="-frounding-math" />
|
||||
<Add option="-fsignaling-nans" />
|
||||
<Add option="-mfpmath=sse -msse" />
|
||||
<Add option="-fPIC" />
|
||||
<Add option="-DNDEBUG" />
|
||||
<Add option="-DXML_LIBRARY" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-D_CRT_SECURE_NO_WARNINGS" />
|
||||
<Add option="-DUSE_PCH=1" />
|
||||
<Add option="-DUSE_STREFLOP" />
|
||||
<Add option="-DSTREFLOP_SSE" />
|
||||
<Add option="-DSTREFLOP_RANDOM_GEN_SIZE=32" />
|
||||
<Add option="-DLIBM_COMPILING_FLT32" />
|
||||
<Add option="-DCURL_STATICLIB" />
|
||||
<Add option="-D_STDCALL_SUPPORTED" />
|
||||
<Add option="-D_M_IX86" />
|
||||
<Add directory="../../source/shared_lib/include" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
|
|
@ -302,7 +234,6 @@
|
|||
<Add directory="../../source/shared_lib/include/streflop/libm_flt32_source" />
|
||||
<Add directory="../../source/shared_lib/include/platform/common" />
|
||||
<Add directory="../../source/shared_lib/include/map" />
|
||||
<Add directory="$(THIRDPARTY_INCLUDE_DIR)" />
|
||||
<Add directory="$(THIRDPARTY_INCLUDE_DIR)/SDL" />
|
||||
<Add directory="$(THIRDPARTY_INCLUDE_DIR)/lua5.1" />
|
||||
</Compiler>
|
||||
|
|
@ -324,11 +255,10 @@
|
|||
<Add directory="../../source/shared_lib/include/map" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add library="streflop" />
|
||||
<Add library="jpeg" />
|
||||
<Add library="lua" />
|
||||
<Add library="lua5.1" />
|
||||
<Add library="png" />
|
||||
<Add library="sdl" />
|
||||
<Add library="SDL" />
|
||||
<Add library="openal" />
|
||||
<Add library="curl" />
|
||||
<Add library="xerces-c" />
|
||||
|
|
@ -336,7 +266,7 @@
|
|||
<Add library="vorbis" />
|
||||
<Add library="vorbisfile" />
|
||||
<Add library="vorbisenc" />
|
||||
<Add directory="$(THIRDPARTY_LIB_DIR)" />
|
||||
<Add library="streflop" />
|
||||
<Add directory="./" />
|
||||
<Add directory="../../source/linux_deps/lib" />
|
||||
</Linker>
|
||||
|
|
@ -345,6 +275,93 @@
|
|||
<Variable name="THIRDPARTY_INCLUDE_DIR" value="/usr/include" />
|
||||
</Environment>
|
||||
</Target>
|
||||
<Target title="Debug Linux">
|
||||
<Option output="../../source/linux_deps/lib/libglest.a" prefix_auto="0" extension_auto="0" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="Debug Linux/shared_lib" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-Wshadow" />
|
||||
<Add option="-Winit-self" />
|
||||
<Add option="-Wredundant-decls" />
|
||||
<Add option="-Wcast-align" />
|
||||
<Add option="-Wundef" />
|
||||
<Add option="-Wfloat-equal" />
|
||||
<Add option="-Winline" />
|
||||
<Add option="-Wunreachable-code" />
|
||||
<Add option="-Wmissing-include-dirs" />
|
||||
<Add option="-Weffc++" />
|
||||
<Add option="-Wextra" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="-g" />
|
||||
<Add option="-fno-strict-aliasing" />
|
||||
<Add option="-frounding-math" />
|
||||
<Add option="-fsignaling-nans" />
|
||||
<Add option="-mfpmath=sse -msse" />
|
||||
<Add option="-fPIC" />
|
||||
<Add option="-DDEBUG" />
|
||||
<Add option="-DUSE_STREFLOP" />
|
||||
<Add option="-DSTREFLOP_SSE" />
|
||||
<Add option="-DSTREFLOP_RANDOM_GEN_SIZE=32" />
|
||||
<Add option="-DLIBM_COMPILING_FLT32" />
|
||||
<Add directory="../../source/shared_lib/include" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
<Add directory="../../source/shared_lib/include/platform" />
|
||||
<Add directory="../../source/shared_lib/include/platform/posix" />
|
||||
<Add directory="../../source/shared_lib/include/sound" />
|
||||
<Add directory="../../source/shared_lib/include/util" />
|
||||
<Add directory="../../source/shared_lib/include/lua" />
|
||||
<Add directory="../../source/shared_lib/include/xml" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/shared_lib/include/sound/openal" />
|
||||
<Add directory="../../source/shared_lib/include/streflop" />
|
||||
<Add directory="../../source/shared_lib/include/streflop/libm_flt32_source" />
|
||||
<Add directory="../../source/shared_lib/include/platform/common" />
|
||||
<Add directory="../../source/shared_lib/include/map" />
|
||||
<Add directory="$(THIRDPARTY_INCLUDE_DIR)/SDL" />
|
||||
<Add directory="$(THIRDPARTY_INCLUDE_DIR)/lua5.1" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="../../source/shared_lib/include" />
|
||||
<Add directory="../../source/shared_lib/include/graphics" />
|
||||
<Add directory="../../source/shared_lib/include/graphics/gl" />
|
||||
<Add directory="../../source/shared_lib/include/platform" />
|
||||
<Add directory="../../source/shared_lib/include/sound" />
|
||||
<Add directory="../../source/shared_lib/include/util" />
|
||||
<Add directory="../../source/shared_lib/include/lua" />
|
||||
<Add directory="../../source/shared_lib/include/xml" />
|
||||
<Add directory="../../source/shared_lib/include/platform/sdl" />
|
||||
<Add directory="../../source/shared_lib/include/sound/openal" />
|
||||
<Add directory="../../source/shared_lib/include/platform/posix" />
|
||||
<Add directory="../../source/shared_lib/include/streflop" />
|
||||
<Add directory="../../source/shared_lib/include/streflop/libm_flt32_source" />
|
||||
<Add directory="../../source/shared_lib/include/platform/common" />
|
||||
<Add directory="../../source/shared_lib/include/map" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add library="jpeg" />
|
||||
<Add library="lua5.1" />
|
||||
<Add library="png" />
|
||||
<Add library="SDL" />
|
||||
<Add library="openal" />
|
||||
<Add library="curl" />
|
||||
<Add library="xerces-c" />
|
||||
<Add library="ogg" />
|
||||
<Add library="vorbis" />
|
||||
<Add library="vorbisfile" />
|
||||
<Add library="vorbisenc" />
|
||||
<Add library="streflop" />
|
||||
<Add directory="./" />
|
||||
<Add directory="../../source/linux_deps/lib" />
|
||||
</Linker>
|
||||
<Environment>
|
||||
<Variable name="THIRDPARTY_INCLUDE_DIR" value="/usr/include" />
|
||||
<Variable name="THIRDPARTY_LIB_DIR" value="/usr/lib" />
|
||||
</Environment>
|
||||
</Target>
|
||||
</Build>
|
||||
<Unit filename="../../source/shared_lib/include/graphics/BMPReader.h" />
|
||||
<Unit filename="../../source/shared_lib/include/graphics/FileReader.h" />
|
||||
|
|
@ -399,17 +416,20 @@
|
|||
<Unit filename="../../source/shared_lib/include/platform/posix/socket.h" />
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/factory_repository.h">
|
||||
<Option target="Release Linux" />
|
||||
<Option target="Debug Linux" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/gl_wrap.h" />
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/noimpl.h" />
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/platform_main.h" />
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/platform_util.h">
|
||||
<Option target="Release Linux" />
|
||||
<Option target="Debug Linux" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/sdl_private.h" />
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/thread.h" />
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/types.h">
|
||||
<Option target="Release Linux" />
|
||||
<Option target="Debug Linux" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/window.h" />
|
||||
<Unit filename="../../source/shared_lib/include/platform/sdl/window_gl.h" />
|
||||
|
|
@ -478,16 +498,40 @@
|
|||
<Unit filename="../../source/shared_lib/sources/platform/posix/socket.cpp" />
|
||||
<Unit filename="../../source/shared_lib/sources/platform/sdl/factory_repository.cpp">
|
||||
<Option target="Release Linux" />
|
||||
<Option target="Debug Linux" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/sources/platform/sdl/gl_wrap.cpp" />
|
||||
<Unit filename="../../source/shared_lib/sources/platform/sdl/platform_util.cpp">
|
||||
<Option target="Release Linux" />
|
||||
<Option target="Debug Linux" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/sources/platform/sdl/thread.cpp" />
|
||||
<Unit filename="../../source/shared_lib/sources/platform/sdl/window.cpp" />
|
||||
<Unit filename="../../source/shared_lib/sources/platform/sdl/window_gl.cpp" />
|
||||
<Unit filename="../../source/shared_lib/sources/platform/unix/gl_wrap.cpp">
|
||||
<Option target="Release Linux" />
|
||||
<Option target="Debug Linux" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/sources/platform/win32/factory_repository.cpp">
|
||||
<Option target="Debug Win32" />
|
||||
<Option target="Release Win32" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp">
|
||||
<Option target="Debug Win32" />
|
||||
<Option target="Release Win32" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/sources/platform/win32/glob.c">
|
||||
<Option compilerVar="CC" />
|
||||
<Option target="Debug Win32" />
|
||||
<Option target="Release Win32" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/sources/platform/win32/platform_util.cpp">
|
||||
<Option target="Debug Win32" />
|
||||
<Option target="Release Win32" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/sources/sound/ds8/sound_player_ds8.cpp">
|
||||
<Option target="Debug Win32" />
|
||||
<Option target="Release Win32" />
|
||||
</Unit>
|
||||
<Unit filename="../../source/shared_lib/sources/sound/openal/sound_player_openal.cpp" />
|
||||
<Unit filename="../../source/shared_lib/sources/sound/sound.cpp" />
|
||||
|
|
@ -509,7 +553,6 @@
|
|||
<Option compilerVar="CC" />
|
||||
<Option target="Debug Win32" />
|
||||
<Option target="Release Win32" />
|
||||
<Option target="Release_NO_STREFLOP Win32" />
|
||||
</Unit>
|
||||
<Extensions>
|
||||
<code_completion />
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_layout_file>
|
||||
<ActiveTarget name="Release Win32" />
|
||||
<ActiveTarget name="Debug Win32" />
|
||||
<File name="../../source/shared_lib/include/graphics/graphics_interface.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="566" topLine="0" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/platform/common/platform_common.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="747" topLine="8" />
|
||||
<File name="../../source/shared_lib/include/lua/lua_script.h" open="1" top="0" tabpos="26">
|
||||
<Cursor position="558" topLine="0" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/platform/common/platform_common.h" open="1" top="0" tabpos="22">
|
||||
<Cursor position="747" topLine="9" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/platform/posix/socket.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="773" topLine="6" />
|
||||
|
|
@ -13,52 +16,61 @@
|
|||
<File name="../../source/shared_lib/include/platform/sdl/gl_wrap.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="621" topLine="0" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/platform/sdl/platform_main.h" open="1" top="0" tabpos="7">
|
||||
<File name="../../source/shared_lib/include/platform/sdl/platform_main.h" open="1" top="0" tabpos="3">
|
||||
<Cursor position="696" topLine="0" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/platform/win32/platform_definitions.h" open="1" top="0" tabpos="8">
|
||||
<Cursor position="0" topLine="0" />
|
||||
<File name="../../source/shared_lib/include/platform/sdl/thread.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="557" topLine="0" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/platform/win32/platform_util.h" open="1" top="0" tabpos="9">
|
||||
<Cursor position="0" topLine="5" />
|
||||
<File name="../../source/shared_lib/include/streflop/FPUSettings.h" open="1" top="0" tabpos="18">
|
||||
<Cursor position="6002" topLine="172" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/platform/win32/types.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="542" topLine="0" />
|
||||
<File name="../../source/shared_lib/include/streflop/Random.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="10411" topLine="174" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/streflop/streflop.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="1089" topLine="3" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/util/properties.h" open="1" top="0" tabpos="12">
|
||||
<Cursor position="1476" topLine="44" />
|
||||
<File name="../../source/shared_lib/include/util/properties.h" open="1" top="0" tabpos="5">
|
||||
<Cursor position="1476" topLine="23" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/util/util.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="601" topLine="0" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/include/xml/xml_parser.h" open="1" top="0" tabpos="2">
|
||||
<File name="../../source/shared_lib/include/xml/xml_parser.h" open="1" top="0" tabpos="1">
|
||||
<Cursor position="576" topLine="0" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/graphics/gl/base_renderer.cpp" open="1" top="0" tabpos="3">
|
||||
<File name="../../source/shared_lib/sources/graphics/BMPReader.cpp" open="0" top="0" tabpos="0">
|
||||
<Cursor position="0" topLine="6" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/graphics/gl/base_renderer.cpp" open="1" top="0" tabpos="2">
|
||||
<Cursor position="901" topLine="1" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/platform/common/base_thread.cpp" open="0" top="0" tabpos="0">
|
||||
<Cursor position="5169" topLine="119" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/platform/common/platform_common.cpp" open="0" top="0" tabpos="0">
|
||||
<Cursor position="507" topLine="0" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/platform/posix/socket.cpp" open="0" top="0" tabpos="0">
|
||||
<Cursor position="360" topLine="0" />
|
||||
<File name="../../source/shared_lib/sources/platform/common/simple_threads.cpp" open="1" top="1" tabpos="30">
|
||||
<Cursor position="3961" topLine="82" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/platform/win32/platform_util.cpp" open="1" top="0" tabpos="5">
|
||||
<Cursor position="1915" topLine="26" />
|
||||
<File name="../../source/shared_lib/sources/platform/posix/socket.cpp" open="1" top="0" tabpos="27">
|
||||
<Cursor position="686" topLine="14" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/sound/openal/sound_player_openal.cpp" open="1" top="0" tabpos="18">
|
||||
<File name="../../source/shared_lib/sources/sound/openal/sound_player_openal.cpp" open="1" top="0" tabpos="7">
|
||||
<Cursor position="8638" topLine="291" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/util/conversion.cpp" open="1" top="0" tabpos="15">
|
||||
<File name="../../source/shared_lib/sources/util/conversion.cpp" open="1" top="0" tabpos="6">
|
||||
<Cursor position="663" topLine="7" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/util/properties.cpp" open="1" top="0" tabpos="11">
|
||||
<File name="../../source/shared_lib/sources/util/profiler.cpp" open="1" top="0" tabpos="21">
|
||||
<Cursor position="1919" topLine="57" />
|
||||
</File>
|
||||
<File name="../../source/shared_lib/sources/util/properties.cpp" open="1" top="0" tabpos="4">
|
||||
<Cursor position="4900" topLine="115" />
|
||||
</File>
|
||||
<File name="../../source/win32_deps/src/glprocs.c" open="1" top="0" tabpos="4">
|
||||
<Cursor position="64" topLine="0" />
|
||||
<File name="../../source/shared_lib/sources/util/util.cpp" open="1" top="0" tabpos="17">
|
||||
<Cursor position="0" topLine="0" />
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
|
|
|
|||
|
|
@ -317,7 +317,12 @@ MainWindow::MainWindow()
|
|||
wxInitAllImageHandlers();
|
||||
#ifdef WIN32
|
||||
//std::cout << "B" << std::endl;
|
||||
wxIcon icon("IDI_ICON1");
|
||||
#if defined(__MINGW32__)
|
||||
wxIcon icon(ToUnicode("IDI_ICON1"));
|
||||
#else
|
||||
wxIcon icon("IDI_ICON1");
|
||||
#endif
|
||||
|
||||
#else
|
||||
//std::cout << "B" << std::endl;
|
||||
wxIcon icon;
|
||||
|
|
@ -1170,7 +1175,13 @@ bool App::OnInit() {
|
|||
std::cout << std::endl;
|
||||
exit (0);
|
||||
}
|
||||
fileparam = wxFNCONV(argv[1]);
|
||||
|
||||
#if defined(__MINGW32__)
|
||||
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(argv[1]));
|
||||
fileparam = tmp_buf;
|
||||
#else
|
||||
fileparam = wxFNCONV(argv[1]);
|
||||
#endif
|
||||
}
|
||||
|
||||
mainWindow = new MainWindow();
|
||||
|
|
|
|||
Loading…
Reference in New Issue