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

- load of changes to get things compiling under VC++ 2010 (with updated deps seperate for vc2010)

This commit is contained in:
Mark Vejvoda 2012-04-20 01:04:05 +00:00
parent 329bb58b04
commit dbb116f250
122 changed files with 938 additions and 770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mk/windoze/g3d_viewer.vcxproj
View File

@ -84,8 +84,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>"..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;"..\..\source\win32_deps\wxWidgets-2.8.10\include";..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;"../../source/win32_deps/SDL-1.2.x/include";"../../source/win32_deps/curl-7.21.3/include";..\..\source\glest_game\graphics;..\..\source\shared_lib\include\xml;"../../source/win32_deps/xerces-c-3.0.1/src";..\..\source\glest_game\global;..\..\source\glest_game\sound;..\..\source\shared_lib\include\sound;..\..\source\glest_game\game;../../source/shared_lib/include/map;../../source/win32_deps/lpng141;..\..\source\glest_game\facilities;"../../source/win32_deps/glew-1.7.0/include";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;CURL_STATICLIB;UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\source\windows_deps\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\graphics\gl;..\..\source\windows_deps\include;..\..\source\shared_lib\include\graphics;..\..\source\windows_deps\wxWidgets-2.9.3\include;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/curl-7.21.3/include;..\..\source\glest_game\graphics;..\..\source\shared_lib\include\xml;../../source/windows_deps/xerces-c-3.1.1/src;..\..\source\glest_game\global;..\..\source\glest_game\sound;..\..\source\shared_lib\include\sound;..\..\source\glest_game\game;../../source/shared_lib/include/map;../../source/windows_deps/lpng1510;..\..\source\glest_game\facilities;../../source/windows_deps/glew-1.7.0/include;..\..\source\shared_lib\include\xml\rapidxml;../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -97,13 +97,15 @@
<PrecompiledHeaderOutputFile>c:\temp\release\$(TargetName).pch</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<FunctionLevelLinking>true</FunctionLevelLinking>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<AdditionalDependencies>wxbase28.lib;wxbase28_net.lib;wxbase28_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw28_adv.lib;wxmsw28_aui.lib;wxmsw28_core.lib;wxmsw28_gl.lib;wxmsw28_html.lib;wxmsw28_media.lib;wxmsw28_qa.lib;wxmsw28_richtext.lib;wxmsw28_xrc.lib;wxregex.lib;wxtiff.lib;wxzlib.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>../../source/win32_deps/lib;../../build/$(Configuration)/libglest;../../source/shared_lib/sources/streflop/libstreflop;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng15.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)\megaglest_g3dviewer.exe</OutputFile>
<AdditionalLibraryDirectories>../../source/windows_deps/lib;../../build/$(Configuration)/libglest;../../source/shared_lib/sources/streflop/libstreflop;$(DXSDK_DIR)/lib/x86;../../source/windows_deps/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<OptimizeReferences>
</OptimizeReferences>
<EnableCOMDATFolding>

13
mk/windoze/glest_editor.vcxproj
View File

@ -84,8 +84,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\msw;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;..\..\source\win32_deps\wxWidgets-2.8.10\include;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/win32_deps/SDL-1.2.x/include;../../source/win32_deps/curl-7.21.3/include;../../source/shared_lib/include/map;..\..\source\glest_game\global;..\..\source\glest_game\game;..\..\source\glest_game\facilities;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>MWIN;__WXMSW__;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\source\windows_deps\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\windows_deps\include;..\..\source\shared_lib\include\graphics;..\..\source\windows_deps\wxWidgets-2.9.3\include;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;..\..\source\glest_game\global;..\..\source\glest_game\game;..\..\source\glest_game\facilities;..\..\source\shared_lib\include\xml;..\..\source\shared_lib\include\xml\rapidxml;../../source/windows_deps/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -99,9 +99,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>wxbase28.lib;wxbase28_net.lib;wxbase28_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw28_adv.lib;wxmsw28_aui.lib;wxmsw28_core.lib;wxmsw28_gl.lib;wxmsw28_html.lib;wxmsw28_media.lib;wxmsw28_qa.lib;wxmsw28_richtext.lib;wxmsw28_xrc.lib;wxpng.lib;wxregex.lib;wxtiff.lib;wxzlib.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>../../source/win32_deps/lib;../../build/$(Configuration)/libglest;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)\megaglest_editor.exe</OutputFile>
<AdditionalLibraryDirectories>../../source/windows_deps/lib;../../build/$(Configuration)/libglest;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>
@ -141,9 +141,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\source\glest_map_editor\main.h" />
<ClInclude Include="..\..\source\glest_map_editor\map.h" />
<ClInclude Include="..\..\source\glest_map_editor\program.h" />
<ClInclude Include="..\..\source\glest_map_editor\renderer.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="glest_editor.rc" />
@ -152,7 +150,6 @@
<ClCompile Include="..\..\source\glest_game\global\config.cpp" />
<ClCompile Include="..\..\source\glest_map_editor\main.cpp" />
<ClCompile Include="..\..\source\glest_map_editor\program.cpp" />
<ClCompile Include="..\..\source\glest_map_editor\renderer.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="shared_lib.vcxproj">

20
mk/windoze/glest_game.vcxproj
View File

@ -106,23 +106,23 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/tinyxml;../../source/glest_game/ai;../../source/glest_game/facilities;../../source/glest_game/game;../../source/glest_game/global;../../source/glest_game/graphics;../../source/glest_game/gui;../../source/glest_game/main;../../source/glest_game/menu;../../source/glest_game/network;../../source/glest_game/sound;../../source/glest_game/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/win32_deps/include;../../source/win32_deps/xerces-c-3.0.1/src;../../source/win32_deps/SDL-1.2.x/include;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;../../source/win32_deps/openal-soft-1.12.854/include;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/win32_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/win32_deps/libircclient/include;../../source/win32_deps/glew-1.7.0/include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/xml/rapidxml;../../source/glest_game/ai;../../source/glest_game/facilities;../../source/glest_game/game;../../source/glest_game/global;../../source/glest_game/graphics;../../source/glest_game/gui;../../source/glest_game/main;../../source/glest_game/menu;../../source/glest_game/network;../../source/glest_game/sound;../../source/glest_game/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/SDL-1.2.15/include;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/windows_deps/libircclient/include;../../source/windows_deps/glew-1.7.0/include</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;GLEW_STATIC%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4018;4244;4250;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>dsound.lib;dxguid.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;libglest.lib;mmc.lib;lua5.1.lib;xerces-c_3.lib;Dbghelp.lib;libpng.lib;jpeg.lib;zlib.lib;sdl.lib;sdlmain.lib;winmm.lib;openal32.lib;iphlpapi.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;libircclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>../../source/win32_deps/lib;../../build/$(Configuration)/libglest;../../source/shared_lib/sources/streflop/libstreflop;../../source/win32_deps/libircclient/build/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>dsound.lib;dxguid.lib;glew32s.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;libglest.lib;mmc.lib;lua.lib;xerces-c_static_3.lib;Dbghelp.lib;libpng15.lib;jpeg.lib;zlibstat.lib;sdl.lib;sdlmain.lib;winmm.lib;openal32.lib;iphlpapi.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>../../source/windows_deps/lib;../../build/$(Configuration)/libglest;../../source/shared_lib/sources/streflop/libstreflop;$(DXSDK_DIR)/lib/x86;../../source/windows_deps/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@ -136,6 +136,9 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>NotSet</TargetMachine>
<OutputFile>$(OutDir)\megaglest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_NO_STREFLOP|Win32'">
@ -222,6 +225,7 @@
<ClCompile Include="..\..\source\glest_game\menu\menu_state_graphic_info.cpp" />
<ClCompile Include="..\..\source\glest_game\menu\menu_state_join_game.cpp" />
<ClCompile Include="..\..\source\glest_game\menu\menu_state_keysetup.cpp" />
<ClCompile Include="..\..\source\glest_game\menu\menu_state_load_game.cpp" />
<ClCompile Include="..\..\source\glest_game\menu\menu_state_masterserver.cpp" />
<ClCompile Include="..\..\source\glest_game\menu\menu_state_mods.cpp" />
<ClCompile Include="..\..\source\glest_game\menu\menu_state_new_game.cpp" />
@ -238,6 +242,7 @@
<ClCompile Include="..\..\source\glest_game\network\server_interface.cpp" />
<ClCompile Include="..\..\source\glest_game\sound\sound_container.cpp" />
<ClCompile Include="..\..\source\glest_game\sound\sound_renderer.cpp" />
<ClCompile Include="..\..\source\glest_game\types\tileset_model_type.cpp" />
<ClCompile Include="..\..\source\glest_game\type_instances\command.cpp" />
<ClCompile Include="..\..\source\glest_game\type_instances\faction.cpp" />
<ClCompile Include="..\..\source\glest_game\type_instances\object.cpp" />
@ -311,12 +316,15 @@
<ClInclude Include="..\..\source\glest_game\menu\menu_state_custom_game.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_graphic_info.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_join_game.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_keysetup.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_load_game.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_masterserver.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_mods.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_new_game.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_options.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_root.h" />
<ClInclude Include="..\..\source\glest_game\menu\menu_state_scenario.h" />
<ClInclude Include="..\..\source\glest_game\menu\server_line.h" />
<ClInclude Include="..\..\source\glest_game\network\client_interface.h" />
<ClInclude Include="..\..\source\glest_game\network\connection_slot.h" />
<ClInclude Include="..\..\source\glest_game\network\network_interface.h" />
@ -326,6 +334,7 @@
<ClInclude Include="..\..\source\glest_game\network\server_interface.h" />
<ClInclude Include="..\..\source\glest_game\sound\sound_container.h" />
<ClInclude Include="..\..\source\glest_game\sound\sound_renderer.h" />
<ClInclude Include="..\..\source\glest_game\types\tileset_model_type.h" />
<ClInclude Include="..\..\source\glest_game\type_instances\command.h" />
<ClInclude Include="..\..\source\glest_game\type_instances\faction.h" />
<ClInclude Include="..\..\source\glest_game\type_instances\object.h" />
@ -351,6 +360,7 @@
<ClInclude Include="..\..\source\glest_game\world\unit_updater.h" />
<ClInclude Include="..\..\source\glest_game\world\water_effects.h" />
<ClInclude Include="..\..\source\glest_game\world\world.h" />
<ClInclude Include="..\..\source\shared_lib\include\util\string_utils.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="glest.rc" />

35
mk/windoze/shared_lib.vcxproj
View File

@ -94,8 +94,8 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;"../../source/win32_deps/xerces-c-3.0.1/src";"../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude";../../source/win32_deps/lpng141;"../../source/win32_deps/jpeg-8a";"../../source/win32_deps/SDL-1.2.x/include";../../source/shared_lib/include/platform/sdl;"../../source/win32_deps/openal-soft-1.12.854/include";../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;"../../source/win32_deps/curl-7.21.3/include";../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;"../../source/win32_deps/ftgl-2.1.3-rc5/src";"../../source/win32_deps/freetype-2.4.4/include";"../../source/win32_deps/glew-1.7.0/include";../../source/shared_lib/include/graphics/md5;"../../source/shared_lib/include/graphics/freetype-gl";../../source/shared_lib/include/streflop/softfloat;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;USE_FREETYPEGL;GLEW_STATIC%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/xerces-c-3.1.1/src/xercesc/xinclude;../../source/windows_deps/lpng1510;../../source/windows_deps/jpeg-8a;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;../../source/windows_deps/ftgl-2.1.3-rc5/src;../../source/windows_deps/freetype-2.4.4/include;../../source/windows_deps/glew-1.7.0/include;../../source/shared_lib/include/graphics/md5;../../source/shared_lib/include/graphics/freetype-gl;../../source/shared_lib/include/streflop/softfloat;../../source/shared_lib/include/xml/rapidxml;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/platform/win32</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;USE_FREETYPEGL;XERCES_STATIC_LIBRARY;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -107,10 +107,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4250;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalDependencies>libstreflop.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>.\;..\..\source\win32_deps\lib;../../source/win32_deps/libircclient/build/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libstreflop.lib;libcurl.lib;glew32s.lib;freetype244MT.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>.\;..\..\source\windows_deps\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_NO_STREFLOP|Win32'">
@ -166,9 +167,30 @@
<ClCompile Include="..\..\source\shared_lib\sources\feathery_ftp\ftpTargetWin32.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="..\..\source\shared_lib\sources\graphics\font_text.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\freetype-gl\edtaa3func.c" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\freetype-gl\font-manager.c" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\freetype-gl\makefont.c" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\freetype-gl\markup.c" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\freetype-gl\texture-atlas.c" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\freetype-gl\texture-font.c" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\freetype-gl\texture-glyph.c" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\freetype-gl\vector.c" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\freetype-gl\vertex-buffer.c" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\gl\font_textFTGL.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\gl\font_text_freetypegl.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\md5\ArbProgram.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\md5\GlErrors.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\md5\Image.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\md5\Md5Model.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\md5\md5Texture.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\md5\md5util.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\md5\ShaderManager.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\platform\miniupnpc\connecthostport.c" />
<ClCompile Include="..\..\source\shared_lib\sources\platform\miniupnpc\portlistingparse.c" />
<ClCompile Include="..\..\source\shared_lib\sources\platform\miniupnpc\receivedata.c" />
<ClCompile Include="..\..\source\shared_lib\sources\platform\sdl\gl_wrap.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\platform\win32\glob.cpp" />
<ClCompile Include="..\..\source\win32_deps\src\glprocs.c" />
<ClCompile Include="..\..\source\shared_lib\sources\libircclient\src\libircclient.c" />
<ClCompile Include="..\..\source\shared_lib\sources\map\map_preview.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\streflop\Random.cpp" />
@ -206,6 +228,7 @@
<ClCompile Include="..\..\source\shared_lib\sources\graphics\gl\text_renderer_gl.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\graphics\gl\texture_gl.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\lua\lua_script.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\util\string_utils.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\xml\xml_parser.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\util\checksum.cpp" />
<ClCompile Include="..\..\source\shared_lib\sources\util\conversion.cpp" />
@ -245,6 +268,7 @@
<ClCompile Include="..\..\source\shared_lib\sources\platform\posix\ircclient.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\source\shared_lib\include\platform\win32\data_types.h" />
<ClInclude Include="..\..\source\shared_lib\include\streflop\FPUSettings.h" />
<ClInclude Include="..\..\source\shared_lib\include\feathery_ftp\ftp.h" />
<ClInclude Include="..\..\source\shared_lib\include\feathery_ftp\ftpConfig.h" />
@ -332,7 +356,6 @@
<ClInclude Include="..\..\source\shared_lib\include\platform\win32\glob.h" />
<ClInclude Include="..\..\source\shared_lib\include\platform\win32\platform_definitions.h" />
<ClInclude Include="..\..\source\shared_lib\include\platform\win32\platform_util.h" />
<ClInclude Include="..\..\source\shared_lib\include\platform\win32\types.h" />
<ClInclude Include="..\..\source\shared_lib\include\util\checksum.h" />
<ClInclude Include="..\..\source\shared_lib\include\util\conversion.h" />
<ClInclude Include="..\..\source\shared_lib\include\util\factory.h" />

4
mk/windoze/xml2g.vcxproj
View File

@ -69,7 +69,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\source\win32_deps\libxml2-2.7.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\source\windows_deps\libxml2-2.7.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@ -80,7 +80,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>wsock32.lib;libxml2_a.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\source\win32_deps\libxml2-2.7.7\win32\bin.msvc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\source\windows_deps\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>

35
source/g3d_viewer/main.cpp
View File

@ -528,19 +528,26 @@ void MainWindow::setupStartupSettings() {
}
MainWindow::~MainWindow(){
delete renderer;
renderer = NULL;
delete model;
model = NULL;
delete timer;
timer = NULL;
delete glCanvas;
delete model;
model = NULL;
delete renderer;
renderer = NULL;
//delete glCanvas;
if(glCanvas) glCanvas->Destroy();
glCanvas = NULL;
}
void MainWindow::init() {
#if wxCHECK_VERSION(2, 9, 1)
#if wxCHECK_VERSION(2, 9, 3)
glCanvas->setCurrentGLContext();
#elif wxCHECK_VERSION(2, 9, 1)
#else
glCanvas->SetCurrent();
@ -700,7 +707,21 @@ void MainWindow::onClose(wxCloseEvent &event){
//printf("OnClose about to END\n");
//fflush(stdout);
delete this;
delete timer;
timer = NULL;
delete model;
model = NULL;
delete renderer;
renderer = NULL;
//delete glCanvas;
if(glCanvas) glCanvas->Destroy();
glCanvas = NULL;
//delete this;
this->Destroy();
}
// for the mousewheel

6
source/g3d_viewer/main.h
View File

@ -12,8 +12,12 @@
#ifndef _SHADER_G3DVIEWER_MAIN_H_
#define _SHADER_G3DVIEWER_MAIN_H_
#include <string>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <GL/glew.h>
#include <wx/wx.h>
#include <wx/glcanvas.h>

10
source/g3d_viewer/renderer.h
View File

@ -12,12 +12,10 @@
#ifndef _SHADER_G3DVIEWER_RENDERER_H_
#define _SHADER_G3DVIEWER_RENDERER_H_
/*
#include "model_renderer.h"
#include "texture_manager.h"
#include "model.h"
#include "texture.h"
*/
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "model_renderer.h"
#include "texture_manager.h"

6
source/glest_game/ai/ai_rule.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_AIRULE_H_
#define _GLEST_GAME_AIRULE_H_
#include <string>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include "vec.h"
#include "skill_type.h"
#include "leak_dumper.h"

5
source/glest_game/ai/annotated_map.h
View File

@ -17,6 +17,11 @@
#ifndef _GLEST_GAME_ANNOTATED_MAP_H_
#define _GLEST_GAME_ANNOTATED_MAP_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "vec.h"
#include "map.h"

5
source/glest_game/ai/cartographer.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_CARTOGRAPHER_H_
#define _GLEST_GAME_CARTOGRAPHER_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "game_constants.h"
#include "influence_map.h"
#include "annotated_map.h"

5
source/glest_game/ai/cluster_map.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_CLUSTER_MAP_H_
#define _GLEST_GAME_CLUSTER_MAP_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "util.h"
#include "game_constants.h"
#include "skill_type.h"

2
source/glest_game/ai/influence_map.h
View File

@ -14,7 +14,7 @@
#define _GAME_SEARCH_INLUENCE_MAP_H_
#include "vec.h"
#include "types.h"
#include "data_types.h"
#include <algorithm>

9
source/glest_game/ai/node_pool.h
View File

@ -15,12 +15,15 @@
#ifndef _GLEST_GAME_PATHFINDER_NODE_POOL_H_
#define _GLEST_GAME_PATHFINDER_NODE_POOL_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "vec.h"
#include "game_constants.h"
#include "heap.h"
#include "types.h"
#include "data_types.h"
#include <algorithm>
#include <set>
#include <list>

6
source/glest_game/ai/path_finder.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_PATHFINDER_H_
#define _GLEST_GAME_PATHFINDER_H_
#include "vec.h"
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "vec.h"
#include <vector>
#include <map>
#include "game_constants.h"

7
source/glest_game/ai/route_planner.h
View File

@ -13,6 +13,11 @@
#ifndef _GLEST_GAME_ROUTEPLANNER_H_
#define _GLEST_GAME_ROUTEPLANNER_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "game_constants.h"
#include "influence_map.h"
#include "annotated_map.h"
@ -25,7 +30,7 @@
#include "node_pool.h"
#include "world.h"
#include "types.h"
#include "data_types.h"
#define PF_TRACE() SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__)

5
source/glest_game/ai/search_engine.h
View File

@ -14,6 +14,11 @@
#ifndef _GLEST_GAME_SEARCH_ENGINE_
#define _GLEST_GAME_SEARCH_ENGINE_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "math_util.h"
#include "game_constants.h"

5
source/glest_game/facilities/auto_test.h
View File

@ -12,6 +12,11 @@
#ifndef _SHARED_UTIL_AUTO_TEST_H_
#define _SHARED_UTIL_AUTO_TEST_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <ctime>
#include "randomgen.h"
#include <string>

5
source/glest_game/facilities/components.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_GRAPHCOMPONENT_H_
#define _GLEST_GAME_GRAPHCOMPONENT_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <vector>
#include <map>

6
source/glest_game/facilities/game_util.h
View File

@ -12,9 +12,13 @@
#ifndef _GLEST_GAME_GAMEUTIL_H_
#define _GLEST_GAME_GAMEUTIL_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <vector>
#include "util.h"
#include "leak_dumper.h"

5
source/glest_game/facilities/logger.h
View File

@ -12,6 +12,11 @@
#ifndef _SHARED_UTIL_LOGGER_H_
#define _SHARED_UTIL_LOGGER_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <deque>

5
source/glest_game/facilities/pos_iterator.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_UTIL_POSITERATOR_H_
#define _GLEST_GAME_UTIL_POSITERATOR_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <cassert>
#include <stdexcept>
#include "math_util.h"

5
source/glest_game/game/chat_manager.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_CHATMANAGER_H_
#define _GLEST_GAME_CHATMANAGER_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include "font.h"
#include <SDL.h>

6
source/glest_game/game/commander.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_COMMANDER_H_
#define _GLEST_GAME_COMMANDER_H_
#include <vector>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include "vec.h"
#include "selection.h"
#include "command_type.h"

5
source/glest_game/game/console.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_CONSOLE_H_
#define _GLEST_GAME_CONSOLE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <utility>
#include <string>
#include <vector>

8
source/glest_game/game/game.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_GAME_H_
#define _GLEST_GAME_GAME_H_
#include <vector>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include "gui.h"
#include "game_camera.h"
#include "world.h"
@ -23,7 +27,7 @@
#include "script_manager.h"
#include "game_settings.h"
#include "network_interface.h"
#include "types.h"
#include "data_types.h"
#include "leak_dumper.h"
using std::vector;

5
source/glest_game/game/game_camera.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_GAMECAMERA_H_
#define _GLEST_GAME_GAMECAMERA_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "vec.h"
#include "math_util.h"
#include <map>

9
source/glest_game/game/script_manager.h
View File

@ -12,10 +12,13 @@
#ifndef _GLEST_GAME_SCRIPT_MANAGER_H_
#define _GLEST_GAME_SCRIPT_MANAGER_H_
#include <string>
//#include <queue>
#include <list>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <list>
#include "lua_script.h"
#include "components.h"
#include "game_constants.h"

6
source/glest_game/game/stats.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_STATS_H_
#define _GLEST_GAME_STATS_H_
#include <string>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include "game_constants.h"
#include "faction.h"
#include "faction_type.h"

5
source/glest_game/global/config.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_CONFIG_H_
#define _GLEST_GAME_CONFIG_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "properties.h"
#include <vector>
#include "game_constants.h"

6
source/glest_game/global/core_data.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_COREDATA_H_
#define _GLEST_GAME_COREDATA_H_
#include <string>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include "sound.h"
#include "font.h"
#include "texture.h"

5
source/glest_game/global/lang.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_LANG_H_
#define _GLEST_GAME_LANG_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "properties.h"
#include "leak_dumper.h"

5
source/glest_game/global/metrics.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_METRICS_H_
#define _GLEST_GAME_METRICS_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "config.h"
#include "leak_dumper.h"

5
source/glest_game/graphics/debug_renderer.h
View File

@ -16,6 +16,11 @@
#ifndef _GLEST_GAME_DEBUG_RENDERER_
#define _GLEST_GAME_DEBUG_RENDERER_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "vec.h"
#include "math_util.h"
#include "pixmap.h"

6
source/glest_game/graphics/particle_type.h
View File

@ -12,9 +12,13 @@
#ifndef _GLEST_GAME_PARTICLETYPE_H_
#define _GLEST_GAME_PARTICLETYPE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <list>
#include "particle.h"
#include "factory.h"
#include "texture.h"

3
source/glest_game/graphics/renderer.cpp
View File

@ -8,6 +8,7 @@
// License, or (at your option) any later version
// ==============================================================
#define NOMINMAX
#include "renderer.h"
#include "texture_gl.h"
@ -24,9 +25,9 @@
#include "faction.h"
#include "factory_repository.h"
#include <cstdlib>
#include <algorithm>
#include "cache_manager.h"
#include "network_manager.h"
#include <algorithm>
#include "leak_dumper.h"
using namespace Shared::Graphics;

5
source/glest_game/graphics/renderer.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_RENDERER_H_
#define _GLEST_GAME_RENDERER_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "vec.h"
#include "math_util.h"
#include "model.h"

5
source/glest_game/graphics/unit_particle_type.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_UNITPARTICLETYPE_H_
#define _GLEST_GAME_UNITPARTICLETYPE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <list>

6
source/glest_game/gui/display.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_DISPLAY_H_
#define _GLEST_GAME_DISPLAY_H_
#include <string>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include "texture.h"
#include "util.h"
#include "command_type.h"

5
source/glest_game/gui/selection.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_SELECTION_
#define _GLEST_GAME_SELECTION_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "unit.h"
#include <vector>
#include "leak_dumper.h"

5
source/glest_game/main/battle_end.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_BATTLEEND_H_
#define _GLEST_GAME_BATTLEEND_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "program.h"
#include "stats.h"
#include "leak_dumper.h"

7
source/glest_game/main/main.cpp
View File

@ -8,6 +8,11 @@
// License, or (at your option) any later version
// ==============================================================
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "math_wrapper.h"
#include "main.h"
@ -3357,6 +3362,8 @@ int glestMain(int argc, char** argv) {
char langValue[1024]="";
wcstombs(langValue,sysLocale, 1023);
const char *lang_locale = &langValue[0];
delete [] sysLocale;
#else
const char *lang_locale = setlocale(LC_ALL,"");
#endif

1
source/glest_game/main/main.h
View File

@ -13,7 +13,6 @@
#define _GLEST_GAME_MAIN_H_
#include <ctime>
#include "program.h"
#include "window_gl.h"
#include "leak_dumper.h"

5
source/glest_game/main/program.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_PROGRAM_H_
#define _GLEST_GAME_PROGRAM_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "context.h"
#include "platform_util.h"
#include "window_gl.h"

5
source/glest_game/menu/main_menu.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_MAINMENU_H_
#define _GLEST_GAME_MAINMENU_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "lang.h"
#include "console.h"
#include "vec.h"

5
source/glest_game/menu/menu_background.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_MENUBACKGROUND_H_
#define _GLEST_GAME_MENUBACKGROUND_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "particle.h"
#include "camera.h"
#include "vec.h"

5
source/glest_game/menu/menu_state_about.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_MENUSTATEABOUT_H_
#define _GLEST_GAME_MENUSTATEABOUT_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "main_menu.h"
#include "leak_dumper.h"

5
source/glest_game/menu/menu_state_connected_game.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_MENUSTATECONNECTEDGAME_H_
#define _GLEST_GAME_MENUSTATECONNECTEDGAME_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "main_menu.h"
#include "chat_manager.h"
#include "map_preview.h"

5
source/glest_game/menu/menu_state_join_game.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_MENUSTATEJOINGAME_H_
#define _GLEST_GAME_MENUSTATEJOINGAME_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "properties.h"
#include "main_menu.h"
#include "chat_manager.h"

5
source/glest_game/menu/server_line.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_SERVERLINE_H_
#define _GLEST_GAME_SERVERLINE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "masterserver_info.h"
#include "components.h"
#include "lang.h"

6
source/glest_game/network/client_interface.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_CLIENTINTERFACE_H_
#define _GLEST_GAME_CLIENTINTERFACE_H_
#include <vector>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include "network_interface.h"
#include "socket.h"
#include "leak_dumper.h"

2
source/glest_game/network/network_interface.cpp
View File

@ -14,7 +14,7 @@
#include <exception>
#include <cassert>
#include "types.h"
#include "data_types.h"
#include "conversion.h"
#include "platform_util.h"
#include <fstream>

10
source/glest_game/network/network_interface.h
View File

@ -12,17 +12,19 @@
#ifndef _GLEST_GAME_NETWORKINTERFACE_H_
#define _GLEST_GAME_NETWORKINTERFACE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <vector>
#include "checksum.h"
#include "network_message.h"
#include "network_types.h"
#include "game_settings.h"
#include "thread.h"
#include "types.h"
#include "data_types.h"
#include <time.h>
#include "leak_dumper.h"

1
source/glest_game/network/network_manager.h
View File

@ -13,7 +13,6 @@
#define _GLEST_GAME_NETWORKMANAGER_H_
#include <cassert>
#include "socket.h"
#include "checksum.h"
#include "server_interface.h"

2
source/glest_game/network/network_message.cpp
View File

@ -14,7 +14,7 @@
#include <cassert>
#include <stdexcept>
#include "types.h"
#include "data_types.h"
#include "util.h"
#include "game_settings.h"

8
source/glest_game/network/network_types.h
View File

@ -12,9 +12,13 @@
#ifndef _GLEST_GAME_NETWORKTYPES_H_
#define _GLEST_GAME_NETWORKTYPES_H_
#include <string>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "types.h"
#include <string>
#include "data_types.h"
#include "vec.h"
#include "command.h"
#include "leak_dumper.h"

6
source/glest_game/network/server_interface.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_SERVERINTERFACE_H_
#define _GLEST_GAME_SERVERINTERFACE_H_
#include <vector>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include "game_constants.h"
#include "network_interface.h"
#include "connection_slot.h"

5
source/glest_game/sound/sound_container.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_SOUNDCONTAINER_H_
#define _GLEST_GAME_SOUNDCONTAINER_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include "sound.h"
#include "randomgen.h"

5
source/glest_game/sound/sound_renderer.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_SOUNDRENDERER_H_
#define _GLEST_GAME_SOUNDRENDERER_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "sound.h"
#include "sound_player.h"
#include "window.h"

6
source/glest_game/type_instances/command.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_COMMAND_H_
#define _GLEST_GAME_COMMAND_H_
#include <cstdlib>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <cstdlib>
#include "unit.h"
#include "vec.h"
#include "game_constants.h"

6
source/glest_game/type_instances/faction.h
View File

@ -12,9 +12,13 @@
#ifndef _GLEST_GAME_FACTION_H_
#define _GLEST_GAME_FACTION_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include <map>
#include "upgrade.h"
#include "texture.h"
#include "resource.h"

5
source/glest_game/type_instances/object.h
View File

@ -11,6 +11,11 @@
#ifndef _GLEST_GAME_OBJECT_H_
#define _GLEST_GAME_OBJECT_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "model.h"
#include "vec.h"
#include "leak_dumper.h"

5
source/glest_game/type_instances/resource.h
View File

@ -11,6 +11,11 @@
#ifndef _GLEST_GAME_RESOURCE_H_
#define _GLEST_GAME_RESOURCE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include "vec.h"
#include "platform_common.h"

4
source/glest_game/type_instances/unit.cpp
View File

@ -8,10 +8,10 @@
// by the Free Software Foundation; either version 2 of the
// License, or (at your option) any later version
// ==============================================================
#define NOMINMAX
#include "faction.h"
#include <cassert>
#include "unit.h"
#include "unit_particle_type.h"
#include "world.h"

5
source/glest_game/type_instances/unit.h
View File

@ -11,6 +11,11 @@
#ifndef _GLEST_GAME_UNIT_H_
#define _GLEST_GAME_UNIT_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "model.h"
#include "upgrade_type.h"
#include "particle.h"

5
source/glest_game/type_instances/upgrade.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_UPGRADE_H_
#define _GLEST_GAME_UPGRADE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include <string>
#include <map>

5
source/glest_game/types/command_type.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_COMMANDTYPE_H_
#define _GLEST_GAME_COMMANDTYPE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "element_type.h"
#include "resource_type.h"
#include "lang.h"

5
source/glest_game/types/damage_multiplier.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_DAMAGEMULTIPLIER_H_
#define _GLEST_GAME_DAMAGEMULTIPLIER_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include "xml_parser.h"
#include "leak_dumper.h"

6
source/glest_game/types/element_type.h
View File

@ -12,9 +12,13 @@
#ifndef _GLEST_GAME_ELEMENTTYPE_H_
#define _GLEST_GAME_ELEMENTTYPE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include <string>
#include "texture.h"
#include "resource.h"
#include "leak_dumper.h"

5
source/glest_game/types/faction_type.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_FACTIONTYPE_H_
#define _GLEST_GAME_FACTIONTYPE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "unit_type.h"
#include "upgrade_type.h"
#include "sound.h"

6
source/glest_game/types/object_type.h
View File

@ -11,8 +11,12 @@
#ifndef _GLEST_GAME_OBJECTTYPE_H_
#define _GLEST_GAME_OBJECTTYPE_H_
#include <vector>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include "model.h"
#include "vec.h"
#include "leak_dumper.h"

5
source/glest_game/types/resource_type.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_RESOURCETYPE_H_
#define _GLEST_GAME_RESOURCETYPE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "element_type.h"
#include "model.h"
#include "checksum.h"

5
source/glest_game/types/skill_type.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_SKILLTYPE_H_
#define _GLEST_GAME_SKILLTYPE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "sound.h"
#include "vec.h"
#include "model.h"

6
source/glest_game/types/tech_tree.h
View File

@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_TECHTREE_H_
#define _GLEST_GAME_TECHTREE_H_
#include <set>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <set>
#include "util.h"
#include "resource_type.h"
#include "faction_type.h"

6
source/glest_game/types/tileset_model_type.h
View File

@ -11,8 +11,12 @@
#ifndef _GLEST_GAME_TILESET_MODEL_TYPE_H_
#define _GLEST_GAME_TILESET_MODEL_TYPE_H_
#include <vector>
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include "model.h"
#include "vec.h"
#include "leak_dumper.h"

7
source/glest_game/types/unit_type.cpp
View File

@ -9,10 +9,13 @@
// License, or (at your option) any later version
// ==============================================================
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "unit_type.h"
#include <cassert>
#include "util.h"
#include "upgrade_type.h"
#include "resource_type.h"

5
source/glest_game/types/unit_type.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_UNITTYPE_H_
#define _GLEST_GAME_UNITTYPE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "element_type.h"
#include "command_type.h"
#include "damage_multiplier.h"

5
source/glest_game/types/upgrade_type.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_UPGRADETYPE_H_
#define _GLEST_GAME_UPGRADETYPE_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "element_type.h"
#include "checksum.h"
#include "conversion.h"

5
source/glest_game/world/map.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_MAP_H_
#define _GLEST_GAME_MAP_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "vec.h"
#include "math_util.h"
#include "command_type.h"

5
source/glest_game/world/minimap.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_MINIMAP_H_
#define _GLEST_GAME_MINIMAP_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "pixmap.h"
#include "texture.h"
#include "xml_parser.h"

5
source/glest_game/world/scenario.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_SCENARIO_H_
#define _GLEST_GAME_SCENARIO_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <vector>
#include "xml_parser.h"

5
source/glest_game/world/surface_atlas.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_SURFACEATLAS_H_
#define _GLEST_GAME_SURFACEATLAS_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include <set>
#include "texture.h"

5
source/glest_game/world/tileset.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_TILESET_H_
#define _GLEST_GAME_TILESET_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <map>
#include "graphics_interface.h"
#include "xml_parser.h"

5
source/glest_game/world/time_flow.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_TIMEFLOW_H_
#define _GLEST_GAME_TIMEFLOW_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "tileset.h"
#include "sound.h"
#include "leak_dumper.h"

5
source/glest_game/world/unit_updater.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_UNITUPDATER_H_
#define _GLEST_GAME_UNITUPDATER_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "gui.h"
#include "particle.h"
#include "randomgen.h"

5
source/glest_game/world/water_effects.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_WATER_EFFECTS_H_
#define _GLEST_GAME_WATER_EFFECTS_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <vector>
#include "vec.h"
#include "leak_dumper.h"

5
source/glest_game/world/world.h
View File

@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_WORLD_H_
#define _GLEST_GAME_WORLD_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "vec.h"
#include "math_util.h"
#include "resource.h"

11
source/glest_map_editor/main.cpp
View File

@ -435,7 +435,16 @@ void MainWindow::onClose(wxCloseEvent &event) {
wxCommandEvent ev;
MainWindow::onMenuFileSave(ev);
}
delete this;
delete program;
program = NULL;
//delete glCanvas;
if(glCanvas) glCanvas->Destroy();
glCanvas = NULL;
//delete this;
this->Destroy();
}
void MainWindow::setupStartupSettings() {

5
source/glest_map_editor/main.h
View File

@ -12,6 +12,11 @@
#ifndef _MAPEDITOR_MAIN_H_
#define _MAPEDITOR_MAIN_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include <string>
#include <vector>

201
source/glest_map_editor/renderer.cpp
View File

@ -1,201 +0,0 @@
// ==============================================================
// This file is part of Glest (www.glest.org)
//
// Copyright (C) 2001-2008 Martiño Figueroa
//
// You can redistribute this code and/or modify it under
// the terms of the GNU General Public License as published
// by the Free Software Foundation; either version 2 of the
// License, or (at your option) any later version
// ==============================================================
//this file is not used
/*
#include "renderer.h"
#include <cassert>
#include "opengl.h"
#include "vec.h"
using namespace Shared::Graphics;
using namespace Shared::Graphics::Gl;
namespace MapEditor {
// ===============================================
// class Renderer
// ===============================================
void Renderer::init(int clientW, int clientH) {
assertGl();
glFrontFace(GL_CW);
glEnable(GL_CULL_FACE);
glPolygonMode(GL_FRONT, GL_FILL);
glClearColor(0.5, 0.5, 0.5, 1.0);
assertGl();
}
void Renderer::renderMap(MapPreview *map, int x, int y, int clientW, int clientH, int cellSize, bool grid) {
float alt;
float showWater;
assertGl();
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glOrtho(0, clientW, 0, clientH, 1, -1);
glViewport(0, 0, clientW, clientH);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glPushAttrib(GL_CURRENT_BIT);
glTranslatef(static_cast<float>(x), static_cast<float>(y), 0.0f);
glLineWidth(1);
glClear(GL_COLOR_BUFFER_BIT);
glColor3f(0, 0, 0);
for (int j = 0; j < map->getH(); j++) {
for (int i = 0; i < map->getW(); i++) {
if (i * cellSize + x > -cellSize
&& i * cellSize + x < clientW
&& clientH - cellSize - j * cellSize + y > -cellSize
&& clientH - cellSize - j * cellSize + y < clientH) {
//surface
alt = map->getHeight(i, j) / 20.f;
showWater = map->getWaterLevel()/ 20.f - alt;
showWater = (showWater > 0)? showWater:0;
Vec3f surfColor;
switch (map->getSurface(i, j)) {
case 1: surfColor = Vec3f(0.0, 0.8f * alt, 0.f + showWater); break;
case 2: surfColor = Vec3f(0.4f * alt, 0.6f * alt, 0.f + showWater); break;
case 3: surfColor = Vec3f(0.6f * alt, 0.3f * alt, 0.f + showWater); break;
case 4: surfColor = Vec3f(0.7f * alt, 0.7f * alt, 0.7f * alt + showWater); break;
case 5: surfColor = Vec3f(0.7f * alt, 0.5f * alt, 0.3f * alt + showWater); break;
}
glColor3fv(surfColor.ptr());
glBegin(GL_TRIANGLE_STRIP);
glVertex2i(i * cellSize, clientH - j * cellSize - cellSize);
glVertex2i(i * cellSize, clientH - j * cellSize);
glVertex2i(i * cellSize + cellSize, clientH - j * cellSize - cellSize);
glVertex2i(i * cellSize + cellSize, clientH - j * cellSize);
glEnd();
//objects
switch (map->getObject(i, j)) {
case 0: glColor3f(0.f, 0.f, 0.f); break;
case 1: glColor3f(1.f, 0.f, 0.f); break;
case 2: glColor3f(1.f, 1.f, 1.f); break;
case 3: glColor3f(0.5f, 0.5f, 1.f); break;
case 4: glColor3f(0.f, 0.f, 1.f); break;
case 5: glColor3f(0.5f, 0.5f, 0.5f); break;
case 6: glColor3f(1.f, 0.8f, 0.5f); break;
case 7: glColor3f(0.f, 1.f, 1.f); break;
case 8: glColor3f(0.7f, 0.1f, 0.3f); break;
case 9: glColor3f(0.5f, 1.f, 0.1f); break;
case 10: glColor3f(1.f, 0.2f, 0.8f); break;
}
if (map->getObject(i, j) != 0) {
glPointSize(cellSize / 2.f);
glBegin(GL_POINTS);
glVertex2i(i * cellSize + cellSize / 2, clientH - j * cellSize - cellSize / 2);
glEnd();
}
// bool found = false;
//height lines
// if (!found) {
glColor3fv((surfColor*0.5f).ptr());
//left
if (i > 0 && map->getHeight(i - 1, j) > map->getHeight(i, j)) {
glBegin(GL_LINES);
glVertex2i(i * cellSize, clientH - (j + 1) * cellSize);
glVertex2i(i * cellSize, clientH - j * cellSize);
glEnd();
}
//down
if (j > 0 && map->getHeight(i, j - 1) > map->getHeight(i, j)) {
glBegin(GL_LINES);
glVertex2i(i * cellSize, clientH - j * cellSize);
glVertex2i((i + 1) * cellSize, clientH - j * cellSize);
glEnd();
}
glColor3fv((surfColor*2.f).ptr());
//left
if (grid || (i > 0 && map->getHeight(i - 1, j) < map->getHeight(i, j))) {
glBegin(GL_LINES);
glVertex2i(i * cellSize, clientH - (j + 1) * cellSize);
glVertex2i(i * cellSize, clientH - j * cellSize);
glEnd();
}
if (grid || (j > 0 && map->getHeight(i, j - 1) < map->getHeight(i, j))) {
glBegin(GL_LINES);
glVertex2i(i * cellSize, clientH - j * cellSize);
glVertex2i((i + 1) * cellSize, clientH - j * cellSize);
glEnd();
}
// }
//resources
switch (map->getResource(i, j)) {
case 1: glColor3f(1.f, 1.f, 0.f); break;
case 2: glColor3f(0.5f, 0.5f, 0.5f); break;
case 3: glColor3f(1.f, 0.f, 0.f); break;
case 4: glColor3f(0.f, 0.f, 1.f); break;
case 5: glColor3f(0.5f, 0.5f, 1.f); break;
}
if (map->getResource(i, j) != 0) {
glBegin(GL_LINES);
glVertex2i(i * cellSize, clientH - j * cellSize - cellSize);
glVertex2i(i * cellSize + cellSize, clientH - j * cellSize);
glVertex2i(i * cellSize, clientH - j * cellSize);
glVertex2i(i * cellSize + cellSize, clientH - j * cellSize - cellSize);
glEnd();
}
}
}
}
//start locations
glLineWidth(3);
for (int i = 0; i < map->getMaxFactions(); i++) {
switch (i) {
case 0: glColor3f(1.f, 0.f, 0.f); break;
case 1: glColor3f(0.f, 0.f, 1.f); break;
case 2: glColor3f(0.f, 1.f, 0.f); break;
case 3: glColor3f(1.f, 1.f, 0.f); break;
case 4: glColor3f(1.f, 1.f, 1.f); break;
case 5: glColor3f(0.f, 1.f, 0.8f); break;
case 6: glColor3f(1.f, 0.5f, 0.f); break;
case 7: glColor3f(1.f, 0.5f, 1.f); break;
}
glBegin(GL_LINES);
glVertex2i((map->getStartLocationX(i) - 1) * cellSize, clientH - (map->getStartLocationY(i) - 1) * cellSize);
glVertex2i((map->getStartLocationX(i) + 1) * cellSize + cellSize, clientH - (map->getStartLocationY(i) + 1) * cellSize - cellSize);
glVertex2i((map->getStartLocationX(i) - 1) * cellSize, clientH - (map->getStartLocationY(i) + 1) * cellSize - cellSize);
glVertex2i((map->getStartLocationX(i) + 1) * cellSize + cellSize, clientH - (map->getStartLocationY(i) - 1) * cellSize);
glEnd();
}
glPopMatrix();
glPopAttrib();
assertGl();
}
}// end namespace
*/

40
source/glest_map_editor/renderer.h
View File

@ -1,40 +0,0 @@
// ==============================================================
// This file is part of Glest (www.glest.org)
//
// Copyright (C) 2001-2008 Martiño Figueroa
//
// You can redistribute this code and/or modify it under
// the terms of the GNU General Public License as published
// by the Free Software Foundation; either version 2 of the
// License, or (at your option) any later version
// ==============================================================
//this file is not used
/*
#ifndef _MAPEDITOR_RENDERER_H_
#define _MAPEDITOR_RENDERER_H_
#include "map_preview.h"
using namespace Shared::Map;
namespace MapEditor {
// ===============================================
// class Renderer
// ===============================================
class Renderer {
public:
void init(int clientW, int clientH);
void renderMap(MapPreview *map, int x, int y, int clientW, int clientH, int cellSize, bool grid=false);
};
}// end namespace
#endif
*/

2
source/shared_lib/include/graphics/context.h
View File

@ -12,7 +12,7 @@
#ifndef _SHARED_GRAPHICS_CONTEXT_H_
#define _SHARED_GRAPHICS_CONTEXT_H_
#include "types.h"
#include "data_types.h"
#include "leak_dumper.h"
namespace Shared{ namespace Graphics{

2
source/shared_lib/include/graphics/model.h
View File

@ -14,7 +14,7 @@
#include <string>
#include <map>
#include "types.h"
#include "data_types.h"
#include "pixmap.h"
#include "texture_manager.h"
#include "texture.h"

2
source/shared_lib/include/graphics/model_header.h
View File

@ -12,7 +12,7 @@
#ifndef _SHARED_GRAPHICTYPES_MODELHEADER_H_
#define _SHARED_GRAPHICTYPES_MODELHEADER_H_
#include "types.h"
#include "data_types.h"
#include "leak_dumper.h"
using Shared::Platform::uint8;

2
source/shared_lib/include/graphics/pixmap.h
View File

@ -14,7 +14,7 @@
#include <string>
#include "vec.h"
#include "types.h"
#include "data_types.h"
#include <map>
#include "checksum.h"
#include "leak_dumper.h"

2
source/shared_lib/include/graphics/texture.h
View File

@ -12,7 +12,7 @@
#ifndef _SHARED_GRAPHICS_TEXTURE_H_
#define _SHARED_GRAPHICS_TEXTURE_H_
#include "types.h"
#include "data_types.h"
#include "pixmap.h"
#include <string>
#include "leak_dumper.h"

2
source/shared_lib/include/map/map_preview.h
View File

@ -13,7 +13,7 @@
#define _MAPPREVIEW_MAP_H_
#include "util.h"
#include "types.h"
#include "data_types.h"
#include "randomgen.h"
#include "vec.h"
#include <vector>

2
source/shared_lib/include/platform/common/platform_common.h
View File

@ -20,7 +20,7 @@
#include <stdexcept>
#include <list>
#include "types.h"
#include "data_types.h"
#include "checksum.h"
#include <utility>
#include <SDL.h>

5
source/shared_lib/include/platform/posix/ircclient.h
View File

@ -12,6 +12,11 @@
#ifndef _SHARED_PLATFORMCOMMON_IRCTHREAD_H_
#define _SHARED_PLATFORMCOMMON_IRCTHREAD_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "base_thread.h"
#include <vector>
#include <string>

7
source/shared_lib/include/platform/posix/miniftpserver.h
View File

@ -12,10 +12,15 @@
#ifndef _SHARED_PLATFORMCOMMON_MINIFTPSERVERTHREAD_H_
#define _SHARED_PLATFORMCOMMON_MINIFTPSERVERTHREAD_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#endif
#include "base_thread.h"
#include <vector>
#include <string>
#include "types.h"
#include "data_types.h"
#include "socket.h"
#include "leak_dumper.h"

Some files were not shown because too many files have changed in this diff Show More