From c56be68f34b85c56553203d8903e551ff4436e79 Mon Sep 17 00:00:00 2001 From: filux Date: Tue, 26 Jul 2016 19:45:55 +0200 Subject: [PATCH] ignore LNK4099 warnings in case of 'Release*' configurations --- mk/windoze/build-mg-2015.bat | 5 +++-- mk/windoze/build-mg32bit-2015.bat | 5 +++-- mk/windoze/vc2015/g3d_viewer.vcxproj | 6 ++++++ mk/windoze/vc2015/glest_editor.vcxproj | 6 ++++++ mk/windoze/vc2015/glest_game.vcxproj | 6 ++++++ mk/windoze/vc2015/megaglest_tests.vcxproj | 6 ++++++ 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/mk/windoze/build-mg-2015.bat b/mk/windoze/build-mg-2015.bat index f58e6d3a..2184f8a6 100644 --- a/mk/windoze/build-mg-2015.bat +++ b/mk/windoze/build-mg-2015.bat @@ -85,11 +85,11 @@ ECHO -------------------------------- Echo Updating Code from GIT to latest Revision... cd ..\..\ set GIT_NORM_BRANCH=. -for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a +for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\*[^(]*([^) d]*[ ]*detached"') do @set GIT_NORM_BRANCH=%%a if "%GIT_NORM_BRANCH%" == "." git pull cd data\glest_game set GIT_NORM_BRANCH=. -for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a +for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\*[^(]*([^) d]*[ ]*detached"') do @set GIT_NORM_BRANCH=%%a if "%GIT_NORM_BRANCH%" == "." git pull cd ..\..\ git submodule update @@ -166,5 +166,6 @@ rem if not "%2" == "rebuild" msbuild %msBuildMaxCPU% /v:q /p:TrackFileAccess=fal rem if not "%2" == "rebuild" msbuild %msBuildMaxCPU% /v:q /p:TrackFileAccess=false;VCTargetsPath=%MSBUILD_PATH_MG_x64%;Configuration=%MSBUILD_CONFIG%;Platform=x64;PlatformToolset=v140 /m Glest_vc2015.sln if not "%2" == "rebuild" msbuild %msBuildMaxCPU% /v:q /p:VCTargetsPath=%MSBUILD_PATH_MG_x64%;Configuration=%MSBUILD_CONFIG%;Platform=x64;PlatformToolset=v140 /m Glest_vc2015.sln +ECHO ... End. rem pause execution so we can see the output before the batch file exits if not "%1" == "nopause" pause diff --git a/mk/windoze/build-mg32bit-2015.bat b/mk/windoze/build-mg32bit-2015.bat index d7b7ceeb..db72675b 100644 --- a/mk/windoze/build-mg32bit-2015.bat +++ b/mk/windoze/build-mg32bit-2015.bat @@ -79,11 +79,11 @@ ECHO -------------------------------- Echo Updating Code from GIT to latest Revision... cd ..\..\ set GIT_NORM_BRANCH=. -for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a +for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\*[^(]*([^) d]*[ ]*detached"') do @set GIT_NORM_BRANCH=%%a if "%GIT_NORM_BRANCH%" == "." git pull cd data\glest_game set GIT_NORM_BRANCH=. -for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a +for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\*[^(]*([^) d]*[ ]*detached"') do @set GIT_NORM_BRANCH=%%a if "%GIT_NORM_BRANCH%" == "." git pull cd ..\..\ git submodule update @@ -160,5 +160,6 @@ rem if not "%2" == "rebuild" msbuild %msBuildMaxCPU% /v:q /p:TrackFileAccess=fal rem if not "%2" == "rebuild" msbuild %msBuildMaxCPU% /v:q /p:TrackFileAccess=false;VCTargetsPath=%MSBUILD_PATH_MG_x64%;Configuration=Release;Platform=Win32;PlatformToolset=v140 /m Glest_vc2015.sln if not "%2" == "rebuild" msbuild %msBuildMaxCPU% /v:q /p:VCTargetsPath=%MSBUILD_PATH_MG_x64%;Configuration=Release;Platform=Win32;PlatformToolset=v140 /m Glest_vc2015.sln +ECHO ... End. rem pause execution so we can see the output before the batch file exits if not "%1" == "nopause" pause diff --git a/mk/windoze/vc2015/g3d_viewer.vcxproj b/mk/windoze/vc2015/g3d_viewer.vcxproj index 70b004bf..9715f51a 100644 --- a/mk/windoze/vc2015/g3d_viewer.vcxproj +++ b/mk/windoze/vc2015/g3d_viewer.vcxproj @@ -224,6 +224,7 @@ false + /ignore:4099 %(AdditionalOptions) @@ -260,6 +261,7 @@ false + /ignore:4099 %(AdditionalOptions) @@ -297,6 +299,7 @@ false + /ignore:4099 %(AdditionalOptions) @@ -334,6 +337,7 @@ false + /ignore:4099 %(AdditionalOptions) @@ -363,6 +367,7 @@ true true MachineX86 + /ignore:4099 %(AdditionalOptions) @@ -391,6 +396,7 @@ Windows true true + /ignore:4099 %(AdditionalOptions) diff --git a/mk/windoze/vc2015/glest_editor.vcxproj b/mk/windoze/vc2015/glest_editor.vcxproj index db5168f2..fac45a77 100644 --- a/mk/windoze/vc2015/glest_editor.vcxproj +++ b/mk/windoze/vc2015/glest_editor.vcxproj @@ -223,6 +223,7 @@ false + /ignore:4099 %(AdditionalOptions) @@ -258,6 +259,7 @@ false + /ignore:4099 %(AdditionalOptions) @@ -295,6 +297,7 @@ false ;%(IgnoreSpecificDefaultLibraries) + /ignore:4099 %(AdditionalOptions) @@ -332,6 +335,7 @@ false ;%(IgnoreSpecificDefaultLibraries) + /ignore:4099 %(AdditionalOptions) @@ -361,6 +365,7 @@ true true MachineX86 + /ignore:4099 %(AdditionalOptions) @@ -389,6 +394,7 @@ Windows true true + /ignore:4099 %(AdditionalOptions) diff --git a/mk/windoze/vc2015/glest_game.vcxproj b/mk/windoze/vc2015/glest_game.vcxproj index 8e3937bc..af0685f3 100644 --- a/mk/windoze/vc2015/glest_game.vcxproj +++ b/mk/windoze/vc2015/glest_game.vcxproj @@ -286,6 +286,7 @@ true + /ignore:4099 %(AdditionalOptions) @@ -336,6 +337,7 @@ + /ignore:4099 %(AdditionalOptions) @@ -387,6 +389,7 @@ true + /ignore:4099 %(AdditionalOptions) @@ -437,6 +440,7 @@ + /ignore:4099 %(AdditionalOptions) @@ -477,6 +481,7 @@ NotSet + /ignore:4099 %(AdditionalOptions) @@ -516,6 +521,7 @@ false + /ignore:4099 %(AdditionalOptions) diff --git a/mk/windoze/vc2015/megaglest_tests.vcxproj b/mk/windoze/vc2015/megaglest_tests.vcxproj index 7415e278..b5c7baf0 100644 --- a/mk/windoze/vc2015/megaglest_tests.vcxproj +++ b/mk/windoze/vc2015/megaglest_tests.vcxproj @@ -232,6 +232,7 @@ ../../../source/windows_deps_2015/lib;../../../build/$(Configuration)/libglest;../../../source/shared_lib/sources/streflop/libstreflop;$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;../../../source/windows_deps_2015/cppunit/lib;%(AdditionalLibraryDirectories) 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;libpng16.lib;jpeg.lib;zlibstat.lib;sdl2.lib;sdl2main.lib;winmm.lib;openal32.lib;iphlpapi.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;libeay32.lib;ssleay32.lib;crash_generation_client.lib;exception_handler.lib;common.lib;processor_bits.lib;cppunit.lib;version.lib;imm32.lib;%(AdditionalDependencies) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + /ignore:4099 %(AdditionalOptions) $(OutDir)\megaglest_tests.exe @@ -263,6 +264,7 @@ ../../../source/windows_deps_2015/lib;../../../build/$(Configuration)/libglest;../../../source/shared_lib/sources/streflop/libstreflop;$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;../../../source/windows_deps_2015/cppunit/lib;%(AdditionalLibraryDirectories) 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;libeay32.lib;ssleay32.lib;crash_generation_client.lib;exception_handler.lib;common.lib;processor_bits.lib;cppunit.lib;%(AdditionalDependencies) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + /ignore:4099 %(AdditionalOptions) $(OutDir)\megaglest_tests.exe @@ -294,6 +296,7 @@ ../../../source/windows_deps_2015/lib;../../../build/$(Configuration)/libglest;../../../source/shared_lib/sources/streflop/libstreflop;$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;../../../source/windows_deps_2015/cppunit/lib;%(AdditionalLibraryDirectories) 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;libeay32.lib;ssleay32.lib;crash_generation_client.lib;exception_handler.lib;common.lib;processor_bits.lib;cppunit.lib;%(AdditionalDependencies) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + /ignore:4099 %(AdditionalOptions) $(OutDir)\megaglest_tests.exe @@ -328,6 +331,7 @@ ../../../source/windows_deps_2015/lib;../../../build/$(Configuration)/libglest;$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;../../../source/windows_deps_2015/cppunit/lib;%(AdditionalLibraryDirectories) 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;libpng16.lib;jpeg.lib;zlibstat.lib;sdl2.lib;sdl2main.lib;winmm.lib;openal64.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;cppunit.lib;version.lib;imm32.lib;%(AdditionalDependencies) ;%(IgnoreSpecificDefaultLibraries) + /ignore:4099 %(AdditionalOptions) $(OutDir)\$(TargetName)$(TargetExt) @@ -362,6 +366,7 @@ ../../../source/windows_deps_2015/lib;../../../build/$(Configuration)/libglest;$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;../../../source/windows_deps_2015/cppunit/lib;%(AdditionalLibraryDirectories) 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;libpng16.lib;jpeg.lib;zlibstat.lib;sdl2.lib;sdl2main.lib;winmm.lib;openal64.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;cppunit.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) ;%(IgnoreSpecificDefaultLibraries) + /ignore:4099 %(AdditionalOptions) $(OutDir)\$(TargetName)$(TargetExt) @@ -396,6 +401,7 @@ ../../../source/windows_deps_2015/lib;../../../build/$(Configuration)/libglest;$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;../../../source/windows_deps_2015/cppunit/lib;%(AdditionalLibraryDirectories) 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;openal64.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;cppunit.lib;%(AdditionalDependencies) ;%(IgnoreSpecificDefaultLibraries) + /ignore:4099 %(AdditionalOptions) $(OutDir)\$(TargetName)$(TargetExt)