From b7e1ad8784d5e73116ca1c2c5eb7a2c13ddff8c8 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Mon, 14 May 2018 23:32:52 +0200 Subject: [PATCH] Polished Windows build system --- mk/windows/vs2015-32/libglest.vcxproj | 9 ++++----- mk/windows/vs2015-32/libstreflop.vcxproj | 3 +-- mk/windows/vs2015-32/zetaglest.vcxproj | 11 +++++------ mk/windows/vs2015-64/g2xml.vcxproj | 4 ++-- mk/windows/vs2015-64/g3d_viewer.vcxproj | 4 ++-- mk/windows/vs2015-64/libglest.vcxproj | 10 +++++----- mk/windows/vs2015-64/libstreflop.vcxproj | 4 ++-- mk/windows/vs2015-64/map_editor.vcxproj | 4 ++-- mk/windows/vs2015-64/zetaglest.vcxproj | 9 ++++----- mk/windows/vs2017-32/libglest.vcxproj | 9 ++++----- mk/windows/vs2017-32/libstreflop.vcxproj | 3 +-- mk/windows/vs2017-32/zetaglest.vcxproj | 11 +++++------ mk/windows/vs2017-64/g2xml.vcxproj | 4 ++-- mk/windows/vs2017-64/g3d_viewer.vcxproj | 4 ++-- mk/windows/vs2017-64/libglest.vcxproj | 10 +++++----- mk/windows/vs2017-64/libstreflop.vcxproj | 4 ++-- mk/windows/vs2017-64/map_editor.vcxproj | 4 ++-- mk/windows/vs2017-64/zetaglest.vcxproj | 9 ++++----- 18 files changed, 54 insertions(+), 62 deletions(-) diff --git a/mk/windows/vs2015-32/libglest.vcxproj b/mk/windows/vs2015-32/libglest.vcxproj index c59121ca7..0634ed484 100644 --- a/mk/windows/vs2015-32/libglest.vcxproj +++ b/mk/windows/vs2015-32/libglest.vcxproj @@ -390,9 +390,9 @@ %(AdditionalOptions) Full - Disabled - false - Neither + AnySuitable + true + Speed true ../../../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/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/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;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\fribidi;..\dependencies\include;..\dependencies\src\fribidi\vs2015-32;..\dependencies\src\fribidi\vs2015-32\lib;%(AdditionalIncludeDirectories) NDEBUG;AL_LIBTYPE_STATIC;WIN32;_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;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions) @@ -400,8 +400,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb diff --git a/mk/windows/vs2015-32/libstreflop.vcxproj b/mk/windows/vs2015-32/libstreflop.vcxproj index 64d3c9f4f..cd10c867c 100644 --- a/mk/windows/vs2015-32/libstreflop.vcxproj +++ b/mk/windows/vs2015-32/libstreflop.vcxproj @@ -304,8 +304,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb diff --git a/mk/windows/vs2015-32/zetaglest.vcxproj b/mk/windows/vs2015-32/zetaglest.vcxproj index 66544fc0f..94ff2358a 100644 --- a/mk/windows/vs2015-32/zetaglest.vcxproj +++ b/mk/windows/vs2015-32/zetaglest.vcxproj @@ -465,11 +465,11 @@ %(AdditionalOptions) Full - Disabled - false - Neither + AnySuitable + true + Speed false - false + true ../../../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/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/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ %(AdditionalUsingDirectories) NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_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;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) @@ -477,8 +477,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise $(OutDir)$(TargetName).pdb Level3 diff --git a/mk/windows/vs2015-64/g2xml.vcxproj b/mk/windows/vs2015-64/g2xml.vcxproj index 96b911bea..2d90496c4 100644 --- a/mk/windows/vs2015-64/g2xml.vcxproj +++ b/mk/windows/vs2015-64/g2xml.vcxproj @@ -91,11 +91,11 @@ Level3 ProgramDatabase true - - + StreamingSIMDExtensions2 4996 AnySuitable Speed + false true diff --git a/mk/windows/vs2015-64/g3d_viewer.vcxproj b/mk/windows/vs2015-64/g3d_viewer.vcxproj index ceb2325d6..ea8103b60 100644 --- a/mk/windows/vs2015-64/g3d_viewer.vcxproj +++ b/mk/windows/vs2015-64/g3d_viewer.vcxproj @@ -243,8 +243,7 @@ true Async MultiThreadedDLL - - + StreamingSIMDExtensions2 @@ -261,6 +260,7 @@ true Speed Default + false 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;Dbghelp.lib;sdl2-static.lib;sdl2main.lib;dxguid.lib;libcurl.lib;ws2_32.lib;xerces-c.lib;libpng.lib;turbojpeg-static.lib;ftgl_static.lib;freetype.lib;glew.lib;zlib.lib;version.lib;imm32.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2015-64/libglest.vcxproj b/mk/windows/vs2015-64/libglest.vcxproj index 02015693c..4a8e6377b 100644 --- a/mk/windows/vs2015-64/libglest.vcxproj +++ b/mk/windows/vs2015-64/libglest.vcxproj @@ -300,9 +300,9 @@ %(AdditionalOptions) Full - Disabled - false - Neither + AnySuitable + true + Speed true ../../../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/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/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;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\fribidi;..\dependencies\include;..\dependencies\src\fribidi\vs2015-64;..\dependencies\src\fribidi\vs2015-64\lib;%(AdditionalIncludeDirectories) NDEBUG;AL_LIBTYPE_STATIC;WIN32;_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;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions) @@ -310,8 +310,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb @@ -321,6 +320,7 @@ true NotUsing Default + false libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2015-64/libstreflop.vcxproj b/mk/windows/vs2015-64/libstreflop.vcxproj index b28815fe2..e70fe3eb2 100644 --- a/mk/windows/vs2015-64/libstreflop.vcxproj +++ b/mk/windows/vs2015-64/libstreflop.vcxproj @@ -252,8 +252,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb @@ -261,6 +260,7 @@ ProgramDatabase true 4996;4250;%(DisableSpecificWarnings) + false MachineX64 diff --git a/mk/windows/vs2015-64/map_editor.vcxproj b/mk/windows/vs2015-64/map_editor.vcxproj index d419423fd..3dc485822 100644 --- a/mk/windows/vs2015-64/map_editor.vcxproj +++ b/mk/windows/vs2015-64/map_editor.vcxproj @@ -238,8 +238,7 @@ true Async MultiThreadedDLL - - + StreamingSIMDExtensions2 @@ -255,6 +254,7 @@ true AnySuitable true + false 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;Dbghelp.lib;sdl2-static.lib;sdl2main.lib;dxguid.lib;libcurl.lib;ws2_32.lib;xerces-c.lib;libpng.lib;turbojpeg-static.lib;ftgl_static.lib;freetype.lib;glew.lib;zlib.lib;version.lib;imm32.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2015-64/zetaglest.vcxproj b/mk/windows/vs2015-64/zetaglest.vcxproj index ea0a216b1..7742bc0ef 100644 --- a/mk/windows/vs2015-64/zetaglest.vcxproj +++ b/mk/windows/vs2015-64/zetaglest.vcxproj @@ -379,9 +379,9 @@ %(AdditionalOptions) Full - Disabled - false - Neither + AnySuitable + true + Speed false true ../../../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/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/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ @@ -391,8 +391,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise $(OutDir)$(TargetName).pdb Level3 diff --git a/mk/windows/vs2017-32/libglest.vcxproj b/mk/windows/vs2017-32/libglest.vcxproj index ca733eb65..00a50e110 100644 --- a/mk/windows/vs2017-32/libglest.vcxproj +++ b/mk/windows/vs2017-32/libglest.vcxproj @@ -393,9 +393,9 @@ %(AdditionalOptions) Full - Disabled - false - Neither + AnySuitable + true + Speed true ../../../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/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/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;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../dependencies/src/vlc/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;../dependencies/src/fribidi/;..\dependencies\src\fribidi\vs2017-32;..\dependencies\src\fribidi\vs2017-32\lib;..\dependencies\include;%(AdditionalIncludeDirectories) NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions) @@ -403,8 +403,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb diff --git a/mk/windows/vs2017-32/libstreflop.vcxproj b/mk/windows/vs2017-32/libstreflop.vcxproj index 517450821..11addf176 100644 --- a/mk/windows/vs2017-32/libstreflop.vcxproj +++ b/mk/windows/vs2017-32/libstreflop.vcxproj @@ -304,8 +304,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb diff --git a/mk/windows/vs2017-32/zetaglest.vcxproj b/mk/windows/vs2017-32/zetaglest.vcxproj index fcc027c6c..d9add1964 100644 --- a/mk/windows/vs2017-32/zetaglest.vcxproj +++ b/mk/windows/vs2017-32/zetaglest.vcxproj @@ -465,11 +465,11 @@ %(AdditionalOptions) Full - Disabled - false - Neither + AnySuitable + true + Speed false - false + true ../../../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/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/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies %(AdditionalUsingDirectories) NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) @@ -477,8 +477,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise $(OutDir)$(TargetName).pdb Level3 diff --git a/mk/windows/vs2017-64/g2xml.vcxproj b/mk/windows/vs2017-64/g2xml.vcxproj index 6bb7a5f1a..5186bb9dc 100644 --- a/mk/windows/vs2017-64/g2xml.vcxproj +++ b/mk/windows/vs2017-64/g2xml.vcxproj @@ -91,11 +91,11 @@ Level3 ProgramDatabase true - - + StreamingSIMDExtensions2 4996 AnySuitable Speed + false true diff --git a/mk/windows/vs2017-64/g3d_viewer.vcxproj b/mk/windows/vs2017-64/g3d_viewer.vcxproj index b57702cea..9cc9ec266 100644 --- a/mk/windows/vs2017-64/g3d_viewer.vcxproj +++ b/mk/windows/vs2017-64/g3d_viewer.vcxproj @@ -243,8 +243,7 @@ true Async MultiThreadedDLL - - + StreamingSIMDExtensions2 @@ -261,6 +260,7 @@ true Speed Default + false 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;Dbghelp.lib;sdl2-static.lib;sdl2main.lib;dxguid.lib;libcurl.lib;ws2_32.lib;xerces-c.lib;libpng.lib;turbojpeg-static.lib;ftgl_static.lib;freetype.lib;glew.lib;zlib.lib;version.lib;imm32.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2017-64/libglest.vcxproj b/mk/windows/vs2017-64/libglest.vcxproj index ede597ef4..a9771ce6c 100644 --- a/mk/windows/vs2017-64/libglest.vcxproj +++ b/mk/windows/vs2017-64/libglest.vcxproj @@ -300,9 +300,9 @@ %(AdditionalOptions) Full - Disabled - false - Neither + AnySuitable + true + Speed true ../../../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/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/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;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../dependencies/src/vlc/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;../dependencies/src/fribidi/;..\dependencies\src\fribidi\vs2017-64;..\dependencies\src\fribidi\vs2017-64\lib;..\dependencies\include;%(AdditionalIncludeDirectories) NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions) @@ -310,8 +310,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb @@ -321,6 +320,7 @@ true NotUsing Default + false libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2017-64/libstreflop.vcxproj b/mk/windows/vs2017-64/libstreflop.vcxproj index b7e29e0fd..95b932a06 100644 --- a/mk/windows/vs2017-64/libstreflop.vcxproj +++ b/mk/windows/vs2017-64/libstreflop.vcxproj @@ -252,8 +252,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb @@ -261,6 +260,7 @@ ProgramDatabase true 4996;4250;%(DisableSpecificWarnings) + false MachineX64 diff --git a/mk/windows/vs2017-64/map_editor.vcxproj b/mk/windows/vs2017-64/map_editor.vcxproj index f3b2271a8..5f338de5c 100644 --- a/mk/windows/vs2017-64/map_editor.vcxproj +++ b/mk/windows/vs2017-64/map_editor.vcxproj @@ -238,8 +238,7 @@ true Async MultiThreadedDLL - - + StreamingSIMDExtensions2 @@ -255,6 +254,7 @@ true AnySuitable true + false 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;Dbghelp.lib;sdl2-static.lib;sdl2main.lib;dxguid.lib;libcurl.lib;ws2_32.lib;xerces-c.lib;libpng.lib;turbojpeg-static.lib;ftgl_static.lib;freetype.lib;glew.lib;zlib.lib;version.lib;imm32.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2017-64/zetaglest.vcxproj b/mk/windows/vs2017-64/zetaglest.vcxproj index 1e3e97557..33f71a175 100644 --- a/mk/windows/vs2017-64/zetaglest.vcxproj +++ b/mk/windows/vs2017-64/zetaglest.vcxproj @@ -379,9 +379,9 @@ %(AdditionalOptions) Full - Disabled - false - Neither + AnySuitable + true + Speed false true ../../../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/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/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ @@ -391,8 +391,7 @@ Async MultiThreadedDLL true - - + StreamingSIMDExtensions2 Precise $(OutDir)$(TargetName).pdb Level3