From 55ed12f8d1eb6887d348be03aee5573d44177ffb Mon Sep 17 00:00:00 2001 From: Michael Sartain Date: Thu, 2 Oct 2014 08:25:55 -0700 Subject: Updated the SDK with the latest code from the TF and HL2 branches. --- mp/src/vpc_scripts/source_dll_win32_debug.vpc | 2 +- mp/src/vpc_scripts/source_dll_win32_release.vpc | 9 ++++++--- mp/src/vpc_scripts/source_exe_win_win32_debug.vpc | 2 +- mp/src/vpc_scripts/source_exe_win_win32_release.vpc | 11 +++++++---- mp/src/vpc_scripts/source_lib_win32_release.vpc | 7 +++++-- mp/src/vpc_scripts/source_linux_base_project.vpc | 6 ++++-- mp/src/vpc_scripts/source_posix_base.vpc | 7 +++++-- mp/src/vpc_scripts/source_win32_analyze.vpc | 3 ++- mp/src/vpc_scripts/source_win32_base.vpc | 4 ++++ 9 files changed, 35 insertions(+), 16 deletions(-) (limited to 'mp/src/vpc_scripts') diff --git a/mp/src/vpc_scripts/source_dll_win32_debug.vpc b/mp/src/vpc_scripts/source_dll_win32_debug.vpc index c5b786d2..52e111bf 100644 --- a/mp/src/vpc_scripts/source_dll_win32_debug.vpc +++ b/mp/src/vpc_scripts/source_dll_win32_debug.vpc @@ -153,7 +153,7 @@ $Configuration "Debug" // Input $AdditionalDependencies $IgnoreAllDefaultLibraries - $IgnoreSpecificLibrary "libc;libcd;libcmt" + $IgnoreSpecificLibrary "libc;libcd;libcmt;libcpmt;libcpmt1" $ModuleDefinitionFile $AddModuleToAssembly $EmbedManagedResourceFile diff --git a/mp/src/vpc_scripts/source_dll_win32_release.vpc b/mp/src/vpc_scripts/source_dll_win32_release.vpc index 880e5efc..ba676d49 100644 --- a/mp/src/vpc_scripts/source_dll_win32_release.vpc +++ b/mp/src/vpc_scripts/source_dll_win32_release.vpc @@ -142,8 +142,11 @@ $Configuration "Release" $ErrorReporting "Prompt Immediately (/errorReport:prompt)" $AdditionalOptions "/Zm200" - // Enable extra debugging information. - $AdditionalOptions "$BASE /d2Zi+" + // Enable extra debugging information. This switch requires VS 2013 Update 3. + // With VS 2013 make sure that Edit-And-Continue is disabled in the debugger settings so that + // the debugger uses the enhanced debug information. + // http://randomascii.wordpress.com/2013/09/11/debugging-optimized-codenew-in-visual-studio-2012/ + $AdditionalOptions "$BASE /Zo" $AdditionalOptions "$BASE /Oy-" [$NOFPO] } @@ -165,7 +168,7 @@ $Configuration "Release" // Input $AdditionalDependencies $IgnoreAllDefaultLibraries - $IgnoreSpecificLibrary "libc;libcd;libcmtd" + $IgnoreSpecificLibrary "libc;libcd;libcmtd;libcpmtd;libcpmtd0;libcpmtd1" $ModuleDefinitionFile $AddModuleToAssembly $EmbedManagedResourceFile diff --git a/mp/src/vpc_scripts/source_exe_win_win32_debug.vpc b/mp/src/vpc_scripts/source_exe_win_win32_debug.vpc index 399d1761..e329a255 100644 --- a/mp/src/vpc_scripts/source_exe_win_win32_debug.vpc +++ b/mp/src/vpc_scripts/source_exe_win_win32_debug.vpc @@ -158,7 +158,7 @@ $Configuration "Debug" // Input $AdditionalDependencies $IgnoreAllDefaultLibraries - $IgnoreSpecificLibrary "libc;libcd;libcmt" + $IgnoreSpecificLibrary "libc;libcd;libcmt;libcpmt;libcpmt1" $ModuleDefinitionFile $AddModuleToAssembly $EmbedManagedResourceFile diff --git a/mp/src/vpc_scripts/source_exe_win_win32_release.vpc b/mp/src/vpc_scripts/source_exe_win_win32_release.vpc index 6cb5c335..2f9ab59f 100644 --- a/mp/src/vpc_scripts/source_exe_win_win32_release.vpc +++ b/mp/src/vpc_scripts/source_exe_win_win32_release.vpc @@ -82,7 +82,7 @@ $Configuration "Release" // Preprocessor $PreprocessorDefinitions "$BASE;WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions)" - $PreprocessorDefinitions "$BASE;RELEASE_ASSERTS" [$RELEASEASSERTS] + $PreprocessorDefinitions "$BASE;RELEASEASSERTS" [$RELEASEASSERTS] $IgnoreStandardIncludePath $GeneratePreprocessedFile $KeepComments @@ -141,8 +141,11 @@ $Configuration "Release" $OmitDefaultLibraryNames $ErrorReporting "Prompt Immediately (/errorReport:prompt)" - // Enable extra debugging information. - $AdditionalOptions "$BASE /d2Zi+" + // Enable extra debugging information. This switch requires VS 2013 Update 3. + // With VS 2013 make sure that Edit-And-Continue is disabled in the debugger settings so that + // the debugger uses the enhanced debug information. + // http://randomascii.wordpress.com/2013/09/11/debugging-optimized-codenew-in-visual-studio-2012/ + $AdditionalOptions "$BASE /Zo" // Command Line $AdditionalOptions "$BASE /Oy-" [$NOFPO] } @@ -165,7 +168,7 @@ $Configuration "Release" // Input $AdditionalDependencies $IgnoreAllDefaultLibraries - $IgnoreSpecificLibrary "libc;libcd;libcmtd" + $IgnoreSpecificLibrary "libc;libcd;libcmtd;libcpmtd;libcpmtd0;libcpmtd1" $ModuleDefinitionFile $AddModuleToAssembly $EmbedManagedResourceFile diff --git a/mp/src/vpc_scripts/source_lib_win32_release.vpc b/mp/src/vpc_scripts/source_lib_win32_release.vpc index cbfe4cab..0ceb1eeb 100644 --- a/mp/src/vpc_scripts/source_lib_win32_release.vpc +++ b/mp/src/vpc_scripts/source_lib_win32_release.vpc @@ -139,8 +139,11 @@ $Configuration "Release" $OmitDefaultLibraryNames $ErrorReporting "Prompt Immediately (/errorReport:prompt)" - // Enable extra debugging information. - $AdditionalOptions "/d2Zi+" + // Enable extra debugging information. This switch requires VS 2013 Update 3. + // With VS 2013 make sure that Edit-And-Continue is disabled in the debugger settings so that + // the debugger uses the enhanced debug information. + // http://randomascii.wordpress.com/2013/09/11/debugging-optimized-codenew-in-visual-studio-2012/ + $AdditionalOptions "$BASE /Zo" $AdditionalOptions "$BASE /Oy-" [$NOFPO] } diff --git a/mp/src/vpc_scripts/source_linux_base_project.vpc b/mp/src/vpc_scripts/source_linux_base_project.vpc index 1c920c1b..efb0bbbb 100644 --- a/mp/src/vpc_scripts/source_linux_base_project.vpc +++ b/mp/src/vpc_scripts/source_linux_base_project.vpc @@ -13,7 +13,8 @@ $Configuration "Debug" $Compiler { $PreprocessorDefinitions "DEBUG;_DEBUG" - $OptimizerLevel "-gdwarf-2 -g2 $(OptimizerLevel_CompilerSpecific)" + $OptimizerLevel "-gdwarf-2 -g $(OptimizerLevel_CompilerSpecific)" [$OSXALL] + $OptimizerLevel "-gdwarf-4 -g $(OptimizerLevel_CompilerSpecific)" [$LINUX] } } @@ -22,8 +23,9 @@ $Configuration "Release" $Compiler { $PreprocessorDefinitions "NDEBUG" + $OptimizerLevel "-gdwarf-2 -g $(OptimizerLevel_CompilerSpecific)" [$OSXALL] + $OptimizerLevel "-gdwarf-4 -g $(OptimizerLevel_CompilerSpecific)" [$LINUX] $PreprocessorDefinitions "$BASE;RELEASEASSERTS" [$RELEASEASSERTS] - $OptimizerLevel "-gdwarf-2 -g2 $(OptimizerLevel_CompilerSpecific)" } } diff --git a/mp/src/vpc_scripts/source_posix_base.vpc b/mp/src/vpc_scripts/source_posix_base.vpc index 9e17f832..0aeef1a9 100644 --- a/mp/src/vpc_scripts/source_posix_base.vpc +++ b/mp/src/vpc_scripts/source_posix_base.vpc @@ -12,7 +12,8 @@ $Configuration "Debug" $Compiler { $PreprocessorDefinitions "$BASE;DEBUG;_DEBUG" - $OptimizerLevel "-gdwarf-2 -g2 $(OptimizerLevel_CompilerSpecific)" + $OptimizerLevel "-gdwarf-2 -g2 $(OptimizerLevel_CompilerSpecific)" [$OSXALL] + $OptimizerLevel "-gdwarf-4 -g2 $(OptimizerLevel_CompilerSpecific)" [$LINUX] } } @@ -21,7 +22,9 @@ $Configuration "Release" $Compiler { $PreprocessorDefinitions "$BASE;NDEBUG" - $OptimizerLevel "-gdwarf-2 -g2 $(OptimizerLevel_CompilerSpecific)" + $OptimizerLevel "-gdwarf-2 -g2 $(OptimizerLevel_CompilerSpecific)" [$OSXALL] + $OptimizerLevel "-gdwarf-4 -g2 $(OptimizerLevel_CompilerSpecific)" [$LINUX] + $PreprocessorDefinitions "$BASE;RELEASEASSERTS" [$RELEASEASSERTS] } } diff --git a/mp/src/vpc_scripts/source_win32_analyze.vpc b/mp/src/vpc_scripts/source_win32_analyze.vpc index ceb6e0b0..a1332dee 100644 --- a/mp/src/vpc_scripts/source_win32_analyze.vpc +++ b/mp/src/vpc_scripts/source_win32_analyze.vpc @@ -36,7 +36,8 @@ $Configuration $DisableSpecificWarnings "$BASE;6308;6255;6387;6309;6011;6211;6326;6239;6285;6237;6235;6240;6323;6326;6335;6320;6250;6384;6318;6322" [$ANALYZE] // See http://randomascii.wordpress.com/2011/10/04/analyzecommand-line-options/ for details on these options. // /analyze:only may result in fewer warnings being reported, but the warnings it misses should show up in the regular build. - $AdditionalOptions "$BASE /analyze /analyze:only /analyze:stacksize100000" [$ANALYZE] + $AdditionalOptions "$BASE /analyze /analyze:stacksize100000" [$ANALYZE] + $AdditionalOptions "$BASE /analyze:only" [$ANALYZE && $ANALYZE_MACHINE] // /analyze:only makes builds faster on buildbot but is terrible for incremental /analyze on developer machines // Specify /define:ALLOWSHADOWING to suppress variable shadowing warnings $DisableSpecificWarnings "$BASE;6244;6246" [$ANALYZE && $ALLOWSHADOWING] diff --git a/mp/src/vpc_scripts/source_win32_base.vpc b/mp/src/vpc_scripts/source_win32_base.vpc index 245366f4..4d41cb31 100644 --- a/mp/src/vpc_scripts/source_win32_base.vpc +++ b/mp/src/vpc_scripts/source_win32_base.vpc @@ -8,6 +8,7 @@ $Configuration $General { // Request a specific compiler toolset. + $PlatformToolset "v100" [$VS2010] $PlatformToolset "v110_xp" [$VS2012 && !$ANALYZE] // VS 2012 targeting Windows XP - http://msdn.microsoft.com/en-us/library/vstudio/jj851139.aspx $PlatformToolset "v110" [$VS2012 && $ANALYZE] // VS 2012 for /analyze $PlatformToolset "v120_xp" [$VS2013 && !$ANALYZE] // VS 2013 targeting Windows XP - http://msdn.microsoft.com/en-us/library/vstudio/jj851139.aspx @@ -50,5 +51,8 @@ $Configuration // effect. This option does not show up in the IDE so we need to add it in $AdditionalOptions. // http://blogs.msdn.com/b/vcblog/archive/2013/09/11/introducing-gw-compiler-switch.aspx $AdditionalOptions "$BASE /Gw" [$VS2013] + // Strip unreferenced inline functions from object files to shrink .obj files and .lib files, + // improve linker speed, and improve conformance. Requires VS 2013 Update 3 + $AdditionalOptions "$BASE /Zc:inline" [$VS2013] } } -- cgit v1.2.3