diff --git a/mk/windoze/vc2012/g2xml.vcxproj b/mk/windoze/vc2012/g2xml.vcxproj index f03bee342..753b7ecb1 100644 --- a/mk/windoze/vc2012/g2xml.vcxproj +++ b/mk/windoze/vc2012/g2xml.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {407355A4-D12A-4E3B-A7EB-A835E573B376} @@ -23,33 +31,55 @@ true v110_xp + + Application + Unicode + true + v110 + Application Unicode + + Application + Unicode + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ $(Configuration)\ true + true .\..\..\data\glest_game\ $(Configuration)\ false + false false + false g2xml + + g2xml + Disabled @@ -69,6 +99,23 @@ MachineX86 + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + true + + + true + Console + + MaxSpeed @@ -91,6 +138,27 @@ MachineX86 + + + MaxSpeed + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level3 + ProgramDatabase + true + StreamingSIMDExtensions2 + + + true + Console + true + true + + diff --git a/mk/windoze/vc2012/g3d_viewer.vcxproj b/mk/windoze/vc2012/g3d_viewer.vcxproj index 02bcd3cdd..9a0aa049c 100644 --- a/mk/windoze/vc2012/g3d_viewer.vcxproj +++ b/mk/windoze/vc2012/g3d_viewer.vcxproj @@ -5,14 +5,26 @@ Debug Win32 + + Debug + x64 + Release_NO_STREFLOP Win32 + + Release_NO_STREFLOP + x64 + Release Win32 + + Release + x64 + {FE5C7C7C-F109-44F5-8329-25A4E24F162C} @@ -24,39 +36,63 @@ Application + + Application + Application v110_xp + + Application + v110 + Application + + Application + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 .\..\..\..\data\glest_game\ $(Configuration)/$(ProjectName)\ true + true .\..\..\..\data\glest_game\ $(Configuration)/$(ProjectName)\ false + false $(Configuration)\ $(Configuration)\ true + true megaglest_g3dviewer + megaglest_g3dviewer false + false @@ -86,6 +122,32 @@ MachineX86 + + + Disabled + ..\..\..\source\windows_deps_2012\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2012\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2012\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2012\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/SDL-1.2.x/include;../../../source/windows_deps_2012/curl-7.21.3/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2012/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/windows_deps_2012/lpng141;..\..\..\source\glest_game\facilities + WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + StreamingSIMDExtensions + + + + + + + Level3 + ProgramDatabase + true + + + wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.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_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + $(OutDir)G3D_Viewer.exe + ../../../source/windows_deps_2012/lib;../../../build/$(Configuration)/libglest;../../../source/shared_lib/sources/streflop/libstreflop;%(AdditionalLibraryDirectories) + true + Windows + + /arch:SSE2 %(AdditionalOptions) @@ -122,6 +184,41 @@ + + + /arch:SSE2 %(AdditionalOptions) + ..\..\..\source\windows_deps_2012\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2012\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2012\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/curl-7.21.3/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2012/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_2012/lpng1510;..\..\..\source\glest_game\facilities;../../../source/windows_deps_2012/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) + _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) + true + Async + MultiThreaded + StreamingSIMDExtensions2 + + + + + c:\temp\release\$(TargetName).pch + Level3 + ProgramDatabase + true + Fast + true + + + 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;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng15.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;%(AdditionalDependencies) + $(OutDir)\$(TargetFileName) + ../../../source/windows_deps_2012/lib;../../../build/$(Configuration)/libglest;$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2012/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) + true + Console + + + + + false + + + + /arch:SSE2 %(AdditionalOptions) @@ -151,6 +248,34 @@ MachineX86 + + + /arch:SSE2 %(AdditionalOptions) + ..\..\..\source\windows_deps_2012\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2012\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2012\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2012\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/SDL-1.2.x/include;../../../source/windows_deps_2012/curl-7.21.3/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2012/xerces-c-3.0.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) + true + Async + MultiThreaded + StreamingSIMDExtensions2 + + + + + c:\temp\release\$(TargetName).pch + Level3 + ProgramDatabase + true + + + 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) + $(OutDir)$(ProjectName).exe + ../../../source/windows_deps_2012/lib;../../../build/$(Configuration)/libglest;../../../source/shared_lib/sources/streflop/libstreflop;%(AdditionalLibraryDirectories) + true + Windows + true + true + + diff --git a/mk/windoze/vc2012/glest_editor.vcxproj b/mk/windoze/vc2012/glest_editor.vcxproj index 28fb3bf55..1110d469f 100644 --- a/mk/windoze/vc2012/glest_editor.vcxproj +++ b/mk/windoze/vc2012/glest_editor.vcxproj @@ -5,14 +5,26 @@ Debug Win32 + + Debug + x64 + Release_NO_STREFLOP Win32 + + Release_NO_STREFLOP + x64 + Release Win32 + + Release + x64 + {5D09BE33-81EC-450B-8A7B-2E7B941ADC56} @@ -24,39 +36,63 @@ Application + + Application + Application v110_xp + + Application + v110 + Application + + Application + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 .\..\..\..\data\glest_game\ $(Configuration)/$(ProjectName)\ true + true .\..\..\..\data\glest_game\ $(Configuration)/$(ProjectName)\ false + false $(Configuration)\ $(Configuration)\ true + true megaglest_editor + megaglest_editor false + false @@ -86,6 +122,32 @@ MachineX86 + + + Disabled + ..\..\..\source\windows_deps_2012\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_2012\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2012\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_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/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_2012/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + StreamingSIMDExtensions + + + + + + + Level3 + ProgramDatabase + true + + + 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;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + $(OutDir)Glest_Editor.exe + ../../../source/windows_deps_2012/lib;../../../build/$(Configuration)/libglest;%(AdditionalLibraryDirectories) + true + Windows + + /arch:SSE2 %(AdditionalOptions) @@ -121,6 +183,41 @@ false + + + /arch:SSE2 %(AdditionalOptions) + ..\..\..\source\windows_deps_2012\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_2012\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2012\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/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_2012/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) + true + Async + MultiThreaded + StreamingSIMDExtensions2 + + + + + + + Level3 + ProgramDatabase + true + + + 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) + $(OutDir)\$(TargetFileName) + ../../../source/windows_deps_2012/lib;../../../build/$(Configuration)/libglest;$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2012/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) + true + Windows + + + + + + + false + ;%(IgnoreSpecificDefaultLibraries) + + /arch:SSE2 %(AdditionalOptions) @@ -150,6 +247,34 @@ MachineX86 + + + /arch:SSE2 %(AdditionalOptions) + ..\..\..\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;%(AdditionalIncludeDirectories) + MWIN;__WXMSW__;CURL_STATICLIB;%(PreprocessorDefinitions) + true + Async + MultiThreaded + StreamingSIMDExtensions2 + + + + + c:\temp\release\$(TargetName).pch + Level3 + ProgramDatabase + true + + + 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) + $(OutDir)$(ProjectName).exe + ../../../source/win32_deps/lib;../../../build/$(Configuration)/libglest;%(AdditionalLibraryDirectories) + true + Windows + true + true + + diff --git a/mk/windoze/vc2012/xml2g.vcxproj b/mk/windoze/vc2012/xml2g.vcxproj index 5b20f3d5c..55b46fb00 100644 --- a/mk/windoze/vc2012/xml2g.vcxproj +++ b/mk/windoze/vc2012/xml2g.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A} @@ -23,33 +31,55 @@ true v110_xp + + Application + Unicode + true + v110 + Application Unicode + + Application + Unicode + + + + + + + <_ProjectFileVersion>10.0.30319.1 .\..\..\..\data\glest_game\ $(Configuration)\ true + true .\..\..\..\data\glest_game\ $(Configuration)\ false + false false + false xml2g + + xml2g + Disabled @@ -72,6 +102,26 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wsock32.lib;libxml2_a.lib;%(AdditionalDependencies) + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreaded + + + Level3 + ProgramDatabase + ..\..\..\source\win32_deps\libxml2-2.7.7\include;%(AdditionalIncludeDirectories) + true + + + true + Console + ..\..\..\source\win32_deps\libxml2-2.7.7\win32\bin.msvc;%(AdditionalLibraryDirectories) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;wsock32.lib;libxml2_a.lib;%(AdditionalDependencies) + + MaxSpeed @@ -97,6 +147,30 @@ MachineX86 + + + MaxSpeed + true + ..\..\..\source\windows_deps_2012\libxml2-2.7.7\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level3 + ProgramDatabase + true + StreamingSIMDExtensions2 + + + wsock32.lib;libxml2_a.lib;%(AdditionalDependencies) + ..\..\..\source\windows_deps_2012\lib\;%(AdditionalLibraryDirectories) + true + Console + true + true + +