Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- changed location of windows glest library to make compiling and debugging easier

This commit is contained in:
Mark Vejvoda 2010-12-09 06:40:16 +00:00
parent 2d402f0169
commit debdd50a26
6 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/windoze/glest_game.cbp
View File

@ -128,6 +128,7 @@
<Add library="glest" /> <Add library="glest" />
<Add directory="../../source/win32_deps/lib" /> <Add directory="../../source/win32_deps/lib" />
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" /> <Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
<Add directory="../../data/glest_game/" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release Win32"> <Target title="Release Win32">
@ -254,6 +255,7 @@
<Add library="glest" /> <Add library="glest" />
<Add directory="../../source/win32_deps/lib" /> <Add directory="../../source/win32_deps/lib" />
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" /> <Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
<Add directory="../../data/glest_game/" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release Linux"> <Target title="Release Linux">

30
mk/windoze/glest_game.layout
View File

@ -1,55 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Release Win32" /> <ActiveTarget name="Release Linux" />
<File name="../../source/glest_game/ai/ai.cpp" open="1" top="0" tabpos="9"> <File name="../../source/glest_game/ai/ai.cpp" open="1" top="0" tabpos="10">
<Cursor position="12418" topLine="415" /> <Cursor position="12418" topLine="415" />
</File> </File>
<File name="../../source/glest_game/facilities/game_util.cpp" open="1" top="0" tabpos="12"> <File name="../../source/glest_game/facilities/game_util.cpp" open="1" top="0" tabpos="13">
<Cursor position="1286" topLine="27" /> <Cursor position="1286" topLine="27" />
</File> </File>
<File name="../../source/glest_game/facilities/game_util.h" open="0" top="0" tabpos="11"> <File name="../../source/glest_game/facilities/game_util.h" open="0" top="0" tabpos="11">
<Cursor position="1282" topLine="0" /> <Cursor position="1282" topLine="0" />
</File> </File>
<File name="../../source/glest_game/game/game.cpp" open="1" top="0" tabpos="5"> <File name="../../source/glest_game/game/game.cpp" open="1" top="0" tabpos="6">
<Cursor position="17909" topLine="457" /> <Cursor position="17909" topLine="457" />
</File> </File>
<File name="../../source/glest_game/global/config.cpp" open="1" top="0" tabpos="2"> <File name="../../source/glest_game/global/config.cpp" open="1" top="0" tabpos="3">
<Cursor position="2352" topLine="57" /> <Cursor position="2352" topLine="57" />
</File> </File>
<File name="../../source/glest_game/global/core_data.cpp" open="1" top="0" tabpos="3"> <File name="../../source/glest_game/global/core_data.cpp" open="1" top="0" tabpos="4">
<Cursor position="836" topLine="138" /> <Cursor position="836" topLine="138" />
</File> </File>
<File name="../../source/glest_game/global/core_data.h" open="1" top="1" tabpos="17"> <File name="../../source/glest_game/global/core_data.h" open="1" top="0" tabpos="14">
<Cursor position="603" topLine="1" /> <Cursor position="603" topLine="1" />
</File> </File>
<File name="../../source/glest_game/global/lang.cpp" open="1" top="0" tabpos="4"> <File name="../../source/glest_game/global/lang.cpp" open="1" top="0" tabpos="5">
<Cursor position="900" topLine="17" /> <Cursor position="900" topLine="17" />
</File> </File>
<File name="../../source/glest_game/graphics/particle_type.cpp" open="1" top="0" tabpos="0"> <File name="../../source/glest_game/graphics/particle_type.cpp" open="1" top="0" tabpos="1">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
</File> </File>
<File name="../../source/glest_game/graphics/particle_type.h" open="0" top="0" tabpos="0"> <File name="../../source/glest_game/graphics/particle_type.h" open="0" top="0" tabpos="0">
<Cursor position="654" topLine="2" /> <Cursor position="654" topLine="2" />
</File> </File>
<File name="../../source/glest_game/graphics/renderer.cpp" open="1" top="0" tabpos="7"> <File name="../../source/glest_game/graphics/renderer.cpp" open="1" top="0" tabpos="8">
<Cursor position="4897" topLine="109" /> <Cursor position="4897" topLine="109" />
</File> </File>
<File name="../../source/glest_game/main/main.cpp" open="1" top="0" tabpos="1"> <File name="../../source/glest_game/main/main.cpp" open="1" top="0" tabpos="2">
<Cursor position="19940" topLine="590" /> <Cursor position="19940" topLine="590" />
</File> </File>
<File name="../../source/glest_game/main/program.cpp" open="1" top="0" tabpos="6"> <File name="../../source/glest_game/main/program.cpp" open="1" top="0" tabpos="7">
<Cursor position="16490" topLine="479" /> <Cursor position="16490" topLine="479" />
</File> </File>
<File name="../../source/glest_game/menu/menu_state_connected_game.cpp" open="0" top="0" tabpos="11"> <File name="../../source/glest_game/menu/menu_state_connected_game.cpp" open="0" top="0" tabpos="11">
<Cursor position="12506" topLine="308" /> <Cursor position="12506" topLine="308" />
</File> </File>
<File name="../../source/glest_game/menu/menu_state_custom_game.cpp" open="1" top="0" tabpos="11"> <File name="../../source/glest_game/menu/menu_state_custom_game.cpp" open="1" top="0" tabpos="12">
<Cursor position="77903" topLine="1933" /> <Cursor position="77903" topLine="1933" />
</File> </File>
<File name="../../source/glest_game/network/network_manager.cpp" open="1" top="0" tabpos="10"> <File name="../../source/glest_game/network/network_manager.cpp" open="1" top="0" tabpos="11">
<Cursor position="2716" topLine="34" /> <Cursor position="2716" topLine="34" />
</File> </File>
<File name="../../source/glest_game/type_instances/unit.cpp" open="1" top="0" tabpos="8"> <File name="../../source/glest_game/type_instances/unit.cpp" open="1" top="0" tabpos="9">
<Cursor position="50789" topLine="1676" /> <Cursor position="50789" topLine="1676" />
</File> </File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>

4
mk/windoze/libstreflop.cbp
View File

@ -7,7 +7,7 @@
<Option compiler="mingw32_compiler" /> <Option compiler="mingw32_compiler" />
<Build> <Build>
<Target title="Debug Win32"> <Target title="Debug Win32">
<Option output="../../source/win32_deps/lib/libstreflop.a" prefix_auto="0" extension_auto="0" /> <Option output="../../data/glest_game/libstreflop.a" prefix_auto="0" extension_auto="0" />
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="Debug Win32/libstreflop" /> <Option object_output="Debug Win32/libstreflop" />
<Option type="2" /> <Option type="2" />
@ -34,7 +34,7 @@
</ResourceCompiler> </ResourceCompiler>
</Target> </Target>
<Target title="Release Win32"> <Target title="Release Win32">
<Option output="../../source/win32_deps/lib/libstreflop.a" prefix_auto="0" extension_auto="0" /> <Option output="../../data/glest_game/libstreflop.a" prefix_auto="0" extension_auto="0" />
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="Release Win32/libstreflop" /> <Option object_output="Release Win32/libstreflop" />
<Option type="2" /> <Option type="2" />

4
mk/windoze/megaglest.workspace
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file> <CodeBlocks_workspace_file>
<Workspace title="Workspace"> <Workspace title="Workspace">
<Project filename="libstreflop.cbp" /> <Project filename="libstreflop.cbp" active="1" />
<Project filename="shared_lib.cbp" /> <Project filename="shared_lib.cbp" />
<Project filename="glest_game.cbp" /> <Project filename="glest_game.cbp" />
<Project filename="glest_editor.cbp" /> <Project filename="glest_editor.cbp" />
<Project filename="g3d_viewer.cbp" active="1" /> <Project filename="g3d_viewer.cbp" />
<Project filename="glest_configurator.cbp" /> <Project filename="glest_configurator.cbp" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>

10
mk/windoze/shared_lib.cbp
View File

@ -7,8 +7,8 @@
<Option compiler="mingw32_compiler" /> <Option compiler="mingw32_compiler" />
<Build> <Build>
<Target title="Debug Win32"> <Target title="Debug Win32">
<Option output="../../source/win32_deps/lib/libglest.dll" prefix_auto="0" extension_auto="0" /> <Option output="../../data/glest_game/libglest.dll" prefix_auto="0" extension_auto="0" />
<Option working_dir="../../source/win32_deps/lib" /> <Option working_dir="../../data/glest_game/" />
<Option object_output="Debug Win32/shared_lib" /> <Option object_output="Debug Win32/shared_lib" />
<Option type="3" /> <Option type="3" />
<Option compiler="mingw32_compiler" /> <Option compiler="mingw32_compiler" />
@ -102,11 +102,12 @@
<Add directory="./" /> <Add directory="./" />
<Add directory="../../source/win32_deps/lib" /> <Add directory="../../source/win32_deps/lib" />
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" /> <Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
<Add directory="../../data/glest_game/" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release Win32"> <Target title="Release Win32">
<Option output="../../source/win32_deps/lib/libglest.dll" prefix_auto="0" extension_auto="0" /> <Option output="../../data/glest_game/libglest.dll" prefix_auto="0" extension_auto="0" />
<Option working_dir="../../source/win32_deps/lib" /> <Option working_dir="../../data/glest_game/" />
<Option object_output="Release Win32/shared_lib" /> <Option object_output="Release Win32/shared_lib" />
<Option type="3" /> <Option type="3" />
<Option compiler="mingw32_compiler" /> <Option compiler="mingw32_compiler" />
@ -199,6 +200,7 @@
<Add directory="./" /> <Add directory="./" />
<Add directory="../../source/win32_deps/lib" /> <Add directory="../../source/win32_deps/lib" />
<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" /> <Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
<Add directory="../../data/glest_game/" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release Linux"> <Target title="Release Linux">

4
mk/windoze/shared_lib.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Release Win32" /> <ActiveTarget name="Release Linux" />
<File name="../../source/shared_lib/include/graphics/graphics_interface.h" open="0" top="0" tabpos="0"> <File name="../../source/shared_lib/include/graphics/graphics_interface.h" open="0" top="0" tabpos="0">
<Cursor position="566" topLine="0" /> <Cursor position="566" topLine="0" />
</File> </File>
@ -19,7 +19,7 @@
<File name="../../source/shared_lib/include/platform/sdl/platform_main.h" open="1" top="0" tabpos="3"> <File name="../../source/shared_lib/include/platform/sdl/platform_main.h" open="1" top="0" tabpos="3">
<Cursor position="696" topLine="0" /> <Cursor position="696" topLine="0" />
</File> </File>
<File name="../../source/shared_lib/include/platform/sdl/thread.h" open="0" top="0" tabpos="0"> <File name="../../source/shared_lib/include/platform/sdl/thread.h" open="1" top="1" tabpos="33">
<Cursor position="557" topLine="0" /> <Cursor position="557" topLine="0" />
</File> </File>
<File name="../../source/shared_lib/include/streflop/FPUSettings.h" open="1" top="0" tabpos="9"> <File name="../../source/shared_lib/include/streflop/FPUSettings.h" open="1" top="0" tabpos="9">