From 90b0872f3adff56989fe45794ed1fa700e1440d8 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Fri, 16 Mar 2018 01:17:19 +0100 Subject: [PATCH] Fixed issue with VS2017-32 --- mk/windows/README.md | 6 +----- mk/windows/vs2015-32/glest_game.vcxproj | 4 ++-- mk/windows/vs2015-32/libglest.vcxproj | 4 ++-- mk/windows/vs2015-64/glest_game.vcxproj | 4 ++-- mk/windows/vs2015-64/libglest.vcxproj | 4 ++-- mk/windows/vs2017-32/glest_game.vcxproj | 4 ++-- mk/windows/vs2017-32/libglest.vcxproj | 4 ++-- mk/windows/vs2017-64/glest_game.vcxproj | 4 ++-- mk/windows/vs2017-64/libglest.vcxproj | 2 +- 9 files changed, 16 insertions(+), 20 deletions(-) diff --git a/mk/windows/README.md b/mk/windows/README.md index a2a256804..0ad384db7 100644 --- a/mk/windows/README.md +++ b/mk/windows/README.md @@ -15,18 +15,14 @@ Configuration in Visual Studio must be left as "Release", otherwise it won't com Debug: - Optimization=Disabled Inline Function Expansion: Disabled Enable Intrinsic Functions: No Favor Size Or Speed: Neither Preprocessor: DEBUG instead of NDEBUG - Code Generation->Basic Runtime Checks: Both Release: - Optimization=Full Inline Function Expansion: Any Suitable Enable Intrinsic Functions: Yes Favor Size Or Speed: Favor fast code - Preprocessor: NDEBUG instead of DEBUG - Code Generation->Basic Runtime Checks: Default + Preprocessor: NDEBUG instead of DEBUG \ No newline at end of file diff --git a/mk/windows/vs2015-32/glest_game.vcxproj b/mk/windows/vs2015-32/glest_game.vcxproj index f725fa51c..1c5fdaae5 100644 --- a/mk/windows/vs2015-32/glest_game.vcxproj +++ b/mk/windows/vs2015-32/glest_game.vcxproj @@ -464,7 +464,7 @@ %(AdditionalOptions) - Disabled + Full Disabled false Neither @@ -486,7 +486,7 @@ 4996;4018;4244;4250;4503;%(DisableSpecificWarnings) true true - EnableFastChecks + Default dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2015-32/libglest.vcxproj b/mk/windows/vs2015-32/libglest.vcxproj index c8830e221..c59121ca7 100644 --- a/mk/windows/vs2015-32/libglest.vcxproj +++ b/mk/windows/vs2015-32/libglest.vcxproj @@ -389,7 +389,7 @@ %(AdditionalOptions) - Disabled + Full Disabled false Neither @@ -410,7 +410,7 @@ 4996;4250;%(DisableSpecificWarnings) true NotUsing - EnableFastChecks + Default libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2015-64/glest_game.vcxproj b/mk/windows/vs2015-64/glest_game.vcxproj index b8227e8f4..640437a2a 100644 --- a/mk/windows/vs2015-64/glest_game.vcxproj +++ b/mk/windows/vs2015-64/glest_game.vcxproj @@ -378,7 +378,7 @@ %(AdditionalOptions) - Disabled + Full Disabled false Neither @@ -400,7 +400,7 @@ 4996;4018;4244;4250;4503;%(DisableSpecificWarnings) true true - EnableFastChecks + Default dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2015-64/libglest.vcxproj b/mk/windows/vs2015-64/libglest.vcxproj index 53f0c933f..02015693c 100644 --- a/mk/windows/vs2015-64/libglest.vcxproj +++ b/mk/windows/vs2015-64/libglest.vcxproj @@ -299,7 +299,7 @@ %(AdditionalOptions) - Disabled + Full Disabled false Neither @@ -320,7 +320,7 @@ 4996;4250;%(DisableSpecificWarnings) true NotUsing - EnableFastChecks + Default libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2017-32/glest_game.vcxproj b/mk/windows/vs2017-32/glest_game.vcxproj index 601e8422f..a53a961fc 100644 --- a/mk/windows/vs2017-32/glest_game.vcxproj +++ b/mk/windows/vs2017-32/glest_game.vcxproj @@ -464,7 +464,7 @@ %(AdditionalOptions) - Disabled + Full Disabled false Neither @@ -486,7 +486,7 @@ 4996;4018;4244;4250;4503;%(DisableSpecificWarnings) true true - EnableFastChecks + Default dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2017-32/libglest.vcxproj b/mk/windows/vs2017-32/libglest.vcxproj index bd642b018..ca733eb65 100644 --- a/mk/windows/vs2017-32/libglest.vcxproj +++ b/mk/windows/vs2017-32/libglest.vcxproj @@ -392,7 +392,7 @@ %(AdditionalOptions) - Disabled + Full Disabled false Neither @@ -413,7 +413,7 @@ 4996;4250;%(DisableSpecificWarnings) true NotUsing - EnableFastChecks + Default libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2017-64/glest_game.vcxproj b/mk/windows/vs2017-64/glest_game.vcxproj index 37a643762..8724fe2fe 100644 --- a/mk/windows/vs2017-64/glest_game.vcxproj +++ b/mk/windows/vs2017-64/glest_game.vcxproj @@ -378,7 +378,7 @@ %(AdditionalOptions) - Disabled + Full Disabled false Neither @@ -400,7 +400,7 @@ 4996;4018;4244;4250;4503;%(DisableSpecificWarnings) true true - EnableFastChecks + Default dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies) diff --git a/mk/windows/vs2017-64/libglest.vcxproj b/mk/windows/vs2017-64/libglest.vcxproj index 766090a47..ede597ef4 100644 --- a/mk/windows/vs2017-64/libglest.vcxproj +++ b/mk/windows/vs2017-64/libglest.vcxproj @@ -299,7 +299,7 @@ %(AdditionalOptions) - Disabled + Full Disabled false Neither