From a0c29e7dd67abb15c74c85f07741784877edfdcd Mon Sep 17 00:00:00 2001 From: Joe Ludwig Date: Mon, 2 Sep 2013 11:39:10 -0700 Subject: General: * Fixed a variety of server browser issues with mods based on this SDK * Fixed many warnings on various platforms * Added source code for fgdlib and raytrace * Updated many source files with the latest shared source from TF2. OSX: * Added support for Xcode 4.6 * Switched OSX builds to use Xcode instead of makefiles * Moved libs from src/lib/osx32 to src/lib/public/osx32 or src/lib/common/osx32 to match windows better. Linux: * Moved libs from src/lib/linux32 to src/lib/public/linux32 or src/lib/common/linux32 to match windows better. --- sp/src/vpc_scripts/source_dll_win32_debug.vpc | 52 +++++++++++++-------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'sp/src/vpc_scripts/source_dll_win32_debug.vpc') diff --git a/sp/src/vpc_scripts/source_dll_win32_debug.vpc b/sp/src/vpc_scripts/source_dll_win32_debug.vpc index 5867cc9c..8d53aaf6 100644 --- a/sp/src/vpc_scripts/source_dll_win32_debug.vpc +++ b/sp/src/vpc_scripts/source_dll_win32_debug.vpc @@ -6,18 +6,26 @@ $IgnoreRedundancyWarning "ON" -$MacroRequired "PLATSUBDIR" $MacroRequired "SRCDIR" $MacroRequired "OUTBINNAME" $MacroRequired "OUTBINDIR" +$MacroRequired "LIBPUBLIC" +$MacroRequired "LIBCOMMON" +$MacroRequired "PLATSUBDIR" +$MacroRequired "OUTDLLEXT" +$MacroRequiredAllowEmpty "GAMENAME" +$MacroRequiredAllowEmpty "INTERMEDIATESUBDIR" +$MacroRequiredAllowEmpty "_UNITYSUBDIR" +$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$GAMENAME$PLATSUBDIR$_UNITYSUBDIR" $Configuration "Debug" { $General { // General - $OutputDirectory ".\Debug$PLATSUBDIR" - $IntermediateDirectory ".\Debug$PLATSUBDIR" + $OutputDirectory ".\Debug$_SUBDIRSUFFIX" + $IntermediateDirectory ".\Debug$_SUBDIRSUFFIX" + $ExtensionsToDeleteOnClean $BuildLogFile $InheritedProjectPropertySheets @@ -49,11 +57,10 @@ $Configuration "Debug" // General $AdditionalIncludeDirectories "$SRCDIR\common;$SRCDIR\public;$SRCDIR\public\tier0;$SRCDIR\public\tier1" $Resolve#UsingReferences - $DebugInformationFormat "Program Database for Edit & Continue (/ZI)" [!$EANDCDISABLED && !$WIN64] - $DebugInformationFormat "Program Database (/Zi)" [$EANDCDISABLED || $WIN64] + $DebugInformationFormat "Program Database for Edit & Continue (/ZI)" [$WIN32] + $DebugInformationFormat "Program Database (/Zi)" [$WIN64] $SuppressStartupBanner $WarningLevel "Level 4 (/W4)" - $Detect64bitPortabilityIssues "Yes (/Wp64)" $TreatWarningsAsErrors $UseUNICODEResponseFiles @@ -67,19 +74,14 @@ $Configuration "Debug" $WholeProgramOptimization // Preprocessor - $PreprocessorDefinitions "_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;DLLNAME=$OUTBINNAME" - $PreprocessorDefinitions "$BASE;RAD_TELEMETRY_DISABLED" [$SOURCESDK] + $PreprocessorDefinitions "$BASE;_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" $IgnoreStandardIncludePath $GeneratePreprocessedFile $KeepComments // Code Generation $EnableStringPooling "Yes (/GF)" - // EnableMinimalRebuild is incompatible with /MP (multi-processor builds) - // and it also makes it hard to iterate on warnings because the compiler - // detects that there is no reason to recompile when you request it. - // It should always be off? It should definitely be off for /analyze builds. - //$EnableMinimalRebuild "Yes (/Gm)" [!$ANALYZE] + $EnableMinimalRebuild $EnableC++Exceptions "No" $SmallerTypeCheck $BasicRuntimeChecks "Default" @@ -88,7 +90,6 @@ $Configuration "Debug" $BufferSecurityCheck "Yes" $EnableFunctionLevelLinking $EnableEnhancedInstructionSet - $EnableEnhancedInstructionSet "Streaming SIMD Extensions (/arch:SSE)" [$WIN32] $FloatingPointModel "Fast (/fp:fast)" $EnableFloatingPointExceptions @@ -127,18 +128,18 @@ $Configuration "Debug" $ShowIncludes $UndefinePreprocessorDefinitions $UndefineAllPreprocessorDefinitions - $UseFullPaths + $UseFullPaths "Yes (/FC)" $OmitDefaultLibraryNames $ErrorReporting "Prompt Immediately (/errorReport:prompt)" - // Command Line - $AdditionalOptions "$BASE /MP" + // Command Line (L4D adding /MP) + $AdditionalOptions "/MP /Zm200" } $Linker { // General - $OutputFile "$(OutDir)/$OUTBINNAME.dll" + $OutputFile "$(OutDir)/$OUTBINNAME$OUTDLLEXT" $ShowProgress "Not Set" $Version $EnableIncrementalLinking "Yes (/INCREMENTAL)" @@ -166,13 +167,12 @@ $Configuration "Debug" $ManifestFile $AdditionalManifestDependencies $AllowIsolation + //$UACExecutionLevel [$VS2010] // Debugging $GenerateDebugInfo "Yes (/DEBUG)" $GenerateProgramDatabaseFile "$(IntDir)/$(TargetName).pdb" $StripPrivateSymbols - $GenerateMapFile "No" - $MapFileName "$(IntDir)/$(TargetName).map" $MapExports $DebuggableAssembly @@ -188,6 +188,9 @@ $Configuration "Debug" $SwapRunFromNetwork $Driver + // DYNAMICBASE/ASLR in debug builds is annoying and not helpful. + $RandomizedBaseAddress "false" + // Optimization $References $EnableCOMDATFolding @@ -213,6 +216,7 @@ $Configuration "Debug" $DelayLoadedDLL $ImportLibrary $MergeSections + $TargetMachine $Profile $CLRThreadAttribute $CLRImageType @@ -226,12 +230,6 @@ $Configuration "Debug" $AdditionalOptions } - $Linker [$VS2010] - { - // SAFE_SEH should always be disabled on debug builds. - $ImageHasSafeExceptionHandlers "false" - } - $ManifestTool { // General @@ -285,7 +283,7 @@ $Configuration "Debug" $Resources { // General - $PreprocessorDefinitions "_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + $PreprocessorDefinitions "$BASE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" $Culture "English (United States) (0x409)" $AdditionalIncludeDirectories $IgnoreStandardIncludePath -- cgit v1.2.3