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. --- mp/src/vpc_scripts/source_lib_win32_release.vpc | 44 +++++++++++++++++-------- 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'mp/src/vpc_scripts/source_lib_win32_release.vpc') diff --git a/mp/src/vpc_scripts/source_lib_win32_release.vpc b/mp/src/vpc_scripts/source_lib_win32_release.vpc index 8f80eefc..c3138590 100644 --- a/mp/src/vpc_scripts/source_lib_win32_release.vpc +++ b/mp/src/vpc_scripts/source_lib_win32_release.vpc @@ -6,17 +6,34 @@ $IgnoreRedundancyWarning "ON" -$MacroRequired "PLATSUBDIR" +// Disable frame pointer omission to allow fast stack walking, necessary for +// good ETW profiling. +$Macro NOFPO "1" + $MacroRequired "SRCDIR" $MacroRequired "OUTLIBNAME" $MacroRequired "OUTLIBDIR" +$MacroRequired "LIBPUBLIC" +$MacroRequired "LIBCOMMON" +$MacroRequired "PLATSUBDIR" +$MacroRequiredAllowEmpty "GAMENAME" +$MacroRequiredAllowEmpty "INTERMEDIATESUBDIR" +$MacroRequiredAllowEmpty "_UNITYSUBDIR" +$MacroRequiredAllowEmpty "_STATICSUBDIR" +$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$_STATICSUBDIR$GAMENAME$PLATSUBDIR$_UNITYSUBDIR" $Configuration "Release" { $General { // General - $IntermediateDirectory ".\Release$PLATSUBDIR" + $OutputDirectory ".\Release$_SUBDIRSUFFIX" [!$VS2010 && !$RETAIL && !$PROFILE] + $OutputDirectory ".\Retail$_SUBDIRSUFFIX" [!$VS2010 && $RETAIL] + $OutputDirectory ".\Profile$_SUBDIRSUFFIX" [!$VS2010 && !$RETAIL && $PROFILE] + $OutputDirectory "$OUTLIBDIR" [$VS2010] + $IntermediateDirectory ".\Release$_SUBDIRSUFFIX" [!$RETAIL && !$PROFILE] + $IntermediateDirectory ".\Retail$_SUBDIRSUFFIX" [$RETAIL] + $IntermediateDirectory ".\Profile$_SUBDIRSUFFIX" [!$RETAIL && $PROFILE] $ExtensionsToDeleteOnClean $BuildLogFile $InheritedProjectPropertySheets @@ -28,7 +45,7 @@ $Configuration "Release" $MinimizeCRTUseInATL $CharacterSet "Use Multi-Byte Character Set" $CommonLanguageRuntimeSupport - $WholeProgramOptimization + $WholeProgramOptimization "Use Link Time Code Generation" [$LTCG] } $Debugging @@ -65,9 +82,8 @@ $Configuration "Release" $WholeProgramOptimization // Preprocessor - $PreprocessorDefinitions "WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" - // Enable asserts in release builds if /define:releaseasserts is specified on the VPC command line. - $PreprocessorDefinitions "$BASE;RELEASEASSERTS" [$RELEASEASSERTS] + $PreprocessorDefinitions "$BASE;WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + $PreprocessorDefinitions "$BASE;RELEASE_ASSERTS" [$RELEASEASSERTS] $IgnoreStandardIncludePath $GeneratePreprocessedFile $KeepComments @@ -80,11 +96,10 @@ $Configuration "Release" $BasicRuntimeChecks $RuntimeLibrary "Multi-threaded (/MT)" $StructMemberAlignment - $BufferSecurityCheck "Yes" [$STAGING_ONLY] - $BufferSecurityCheck "No" [!$STAGING_ONLY] + $BufferSecurityCheck "No" [$RETAIL] + $BufferSecurityCheck "Yes" [!$RETAIL] $EnableFunctionLevelLinking "Yes (/Gy)" $EnableEnhancedInstructionSet - $EnableEnhancedInstructionSet "Streaming SIMD Extensions (/arch:SSE)" [$WIN32] $FloatingPointModel "Fast (/fp:fast)" $EnableFloatingPointExceptions @@ -123,14 +138,15 @@ $Configuration "Release" $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" // Enable extra debugging information. - $AdditionalOptions "$BASE /d2Zi+" + $AdditionalOptions "$BASE /d2Zi+" [$VS2010] + $AdditionalOptions "$BASE /Oy-" [$NOFPO] } $Librarian @@ -199,4 +215,4 @@ $Configuration "Release" $Outputs $AdditionalDependencies } -} \ No newline at end of file +} -- cgit v1.2.3 From f56bb35301836e56582a575a75864392a0177875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20P=2E=20Tjern=C3=B8?= Date: Mon, 2 Dec 2013 19:31:46 -0800 Subject: Fix line endings. WHAMMY. --- mp/src/vpc_scripts/source_lib_win32_release.vpc | 436 ++++++++++++------------ 1 file changed, 218 insertions(+), 218 deletions(-) (limited to 'mp/src/vpc_scripts/source_lib_win32_release.vpc') diff --git a/mp/src/vpc_scripts/source_lib_win32_release.vpc b/mp/src/vpc_scripts/source_lib_win32_release.vpc index c3138590..c87a13b7 100644 --- a/mp/src/vpc_scripts/source_lib_win32_release.vpc +++ b/mp/src/vpc_scripts/source_lib_win32_release.vpc @@ -1,218 +1,218 @@ -//----------------------------------------------------------------------------- -// SOURCE_LIB_WIN32_RELEASE.VPC -// -// Base Settings for all Source(TM) Projects -//----------------------------------------------------------------------------- - -$IgnoreRedundancyWarning "ON" - -// Disable frame pointer omission to allow fast stack walking, necessary for -// good ETW profiling. -$Macro NOFPO "1" - -$MacroRequired "SRCDIR" -$MacroRequired "OUTLIBNAME" -$MacroRequired "OUTLIBDIR" -$MacroRequired "LIBPUBLIC" -$MacroRequired "LIBCOMMON" -$MacroRequired "PLATSUBDIR" -$MacroRequiredAllowEmpty "GAMENAME" -$MacroRequiredAllowEmpty "INTERMEDIATESUBDIR" -$MacroRequiredAllowEmpty "_UNITYSUBDIR" -$MacroRequiredAllowEmpty "_STATICSUBDIR" -$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$_STATICSUBDIR$GAMENAME$PLATSUBDIR$_UNITYSUBDIR" - -$Configuration "Release" -{ - $General - { - // General - $OutputDirectory ".\Release$_SUBDIRSUFFIX" [!$VS2010 && !$RETAIL && !$PROFILE] - $OutputDirectory ".\Retail$_SUBDIRSUFFIX" [!$VS2010 && $RETAIL] - $OutputDirectory ".\Profile$_SUBDIRSUFFIX" [!$VS2010 && !$RETAIL && $PROFILE] - $OutputDirectory "$OUTLIBDIR" [$VS2010] - $IntermediateDirectory ".\Release$_SUBDIRSUFFIX" [!$RETAIL && !$PROFILE] - $IntermediateDirectory ".\Retail$_SUBDIRSUFFIX" [$RETAIL] - $IntermediateDirectory ".\Profile$_SUBDIRSUFFIX" [!$RETAIL && $PROFILE] - $ExtensionsToDeleteOnClean - $BuildLogFile - $InheritedProjectPropertySheets - - // Project Defaults - $ConfigurationType "Static Library (.lib)" - $UseOfMFC - $UseOfATL - $MinimizeCRTUseInATL - $CharacterSet "Use Multi-Byte Character Set" - $CommonLanguageRuntimeSupport - $WholeProgramOptimization "Use Link Time Code Generation" [$LTCG] - } - - $Debugging - { - $Command - $CommandArguments - $WorkingDirectory - $Attach - $DebuggerType - $Environment - $MergeEnvironment - $SQLDebugging - } - - $Compiler - { - // General - $AdditionalIncludeDirectories "$SRCDIR\common;$SRCDIR\public;$SRCDIR\public\tier0;$SRCDIR\public\tier1" - $Resolve#UsingReferences - $DebugInformationFormat "C7 Compatible (/Z7)" - $SuppressStartupBanner - $WarningLevel "Level 4 (/W4)" - $Detect64bitPortabilityIssues "Yes (/Wp64)" - $TreatWarningsAsErrors - $UseUNICODEResponseFiles "No" - - // Optimization - $Optimization "Maximize Speed (/O2)" - $InlineFunctionExpansion "Any Suitable (/Ob2)" - $EnableIntrinsicFunctions "Yes (/Oi)" - $FavorSizeOrSpeed "Favor Fast Code (/Ot)" - $OmitFramePointers - $EnableFiberSafeOptimizations - $WholeProgramOptimization - - // Preprocessor - $PreprocessorDefinitions "$BASE;WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" - $PreprocessorDefinitions "$BASE;RELEASE_ASSERTS" [$RELEASEASSERTS] - $IgnoreStandardIncludePath - $GeneratePreprocessedFile - $KeepComments - - // Code Generation - $EnableStringPooling "Yes (/GF)" - $EnableMinimalRebuild - $EnableC++Exceptions "No" - $SmallerTypeCheck - $BasicRuntimeChecks - $RuntimeLibrary "Multi-threaded (/MT)" - $StructMemberAlignment - $BufferSecurityCheck "No" [$RETAIL] - $BufferSecurityCheck "Yes" [!$RETAIL] - $EnableFunctionLevelLinking "Yes (/Gy)" - $EnableEnhancedInstructionSet - $FloatingPointModel "Fast (/fp:fast)" - $EnableFloatingPointExceptions - - // Language - $DisableLanguageExtensions - $DefaultCharUnsigned - $TreatWCHAR_TAsBuiltInType "Yes (/Zc:wchar_t)" - $ForceConformanceInForLoopScope "Yes (/Zc:forScope)" - $EnableRunTimeTypeInfo "Yes (/GR)" - $OpenMPSupport "No" - - // Precompiled Headers - $Create/UsePrecompiledHeader "Not Using Precompiled Headers" - $Create/UsePCHThroughFile - $PrecompiledHeaderFile - - // Output Files - $ExpandAttributedSource "No" - $AssemblerOutput "No Listing" - $ASMListLocation "$(IntDir)/" - $ObjectFileName "$(IntDir)/" - $ProgramDatabaseFileName "$(IntDir)/" - $GenerateXMLDocumentationFiles "No" - $XMLDocumentationFileName - - // Browse Information - $EnableBrowseInformation "None" - $BrowseFile "$(IntDir)/" - - // Advanced - $CallingConvention - $CompileAs "Compile as C++ Code (/TP)" - $DisableSpecificWarnings - $ForceIncludes - $Force#Using - $ShowIncludes - $UndefinePreprocessorDefinitions - $UndefineAllPreprocessorDefinitions - $UseFullPaths "Yes (/FC)" - $OmitDefaultLibraryNames - $ErrorReporting "Prompt Immediately (/errorReport:prompt)" - - // Command Line (L4D adding /MP) - $AdditionalOptions "/MP" - // Enable extra debugging information. - $AdditionalOptions "$BASE /d2Zi+" [$VS2010] - $AdditionalOptions "$BASE /Oy-" [$NOFPO] - } - - $Librarian - { - // General - $OutputFile "$OUTLIBDIR\$OUTLIBNAME.lib" - $AdditionalDependencies - $AdditionalLibraryDirectories - $SuppressStartupBanner "Yes (/NOLOGO)" - $ModuleDefinitionFileName - $IgnoreAllDefaultLibraries - $IgnoreSpecificLibrary - $ExportNamedFunctions - $ForceSymbolReferences - $UseUNICODEResponseFiles "No" - $LinkLibraryDependencies - - // Command Line - $AdditionalOptions - } - - $XMLDocumentGenerator - { - // General - $SuppressStartupBanner "Yes (/nologo)" - $ValidateIntelliSense - $AdditionalDocumentFiles - $OutputDocumentFile - $DocumentLibraryDependencies - $UseUNICODEResponseFiles - } - - $BrowseInformation - { - $SuppressStartupBanner "Yes (/nologo)" - $OutputFile "$(OutDir)/$OUTLIBNAME.bsc" - $AdditionalOptions - } - - $PreBuildEvent - { - $CommandLine - $Description - $ExcludedFromBuild "No" - } - - $PreLinkEvent - { - $CommandLine - $Description - $ExcludedFromBuild "No" - } - - $PostBuildEvent - { - $CommandLine - $Description - $ExcludedFromBuild "No" - } - - $CustomBuildStep - { - // General - $CommandLine - $Description - $Outputs - $AdditionalDependencies - } -} +//----------------------------------------------------------------------------- +// SOURCE_LIB_WIN32_RELEASE.VPC +// +// Base Settings for all Source(TM) Projects +//----------------------------------------------------------------------------- + +$IgnoreRedundancyWarning "ON" + +// Disable frame pointer omission to allow fast stack walking, necessary for +// good ETW profiling. +$Macro NOFPO "1" + +$MacroRequired "SRCDIR" +$MacroRequired "OUTLIBNAME" +$MacroRequired "OUTLIBDIR" +$MacroRequired "LIBPUBLIC" +$MacroRequired "LIBCOMMON" +$MacroRequired "PLATSUBDIR" +$MacroRequiredAllowEmpty "GAMENAME" +$MacroRequiredAllowEmpty "INTERMEDIATESUBDIR" +$MacroRequiredAllowEmpty "_UNITYSUBDIR" +$MacroRequiredAllowEmpty "_STATICSUBDIR" +$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$_STATICSUBDIR$GAMENAME$PLATSUBDIR$_UNITYSUBDIR" + +$Configuration "Release" +{ + $General + { + // General + $OutputDirectory ".\Release$_SUBDIRSUFFIX" [!$VS2010 && !$RETAIL && !$PROFILE] + $OutputDirectory ".\Retail$_SUBDIRSUFFIX" [!$VS2010 && $RETAIL] + $OutputDirectory ".\Profile$_SUBDIRSUFFIX" [!$VS2010 && !$RETAIL && $PROFILE] + $OutputDirectory "$OUTLIBDIR" [$VS2010] + $IntermediateDirectory ".\Release$_SUBDIRSUFFIX" [!$RETAIL && !$PROFILE] + $IntermediateDirectory ".\Retail$_SUBDIRSUFFIX" [$RETAIL] + $IntermediateDirectory ".\Profile$_SUBDIRSUFFIX" [!$RETAIL && $PROFILE] + $ExtensionsToDeleteOnClean + $BuildLogFile + $InheritedProjectPropertySheets + + // Project Defaults + $ConfigurationType "Static Library (.lib)" + $UseOfMFC + $UseOfATL + $MinimizeCRTUseInATL + $CharacterSet "Use Multi-Byte Character Set" + $CommonLanguageRuntimeSupport + $WholeProgramOptimization "Use Link Time Code Generation" [$LTCG] + } + + $Debugging + { + $Command + $CommandArguments + $WorkingDirectory + $Attach + $DebuggerType + $Environment + $MergeEnvironment + $SQLDebugging + } + + $Compiler + { + // General + $AdditionalIncludeDirectories "$SRCDIR\common;$SRCDIR\public;$SRCDIR\public\tier0;$SRCDIR\public\tier1" + $Resolve#UsingReferences + $DebugInformationFormat "C7 Compatible (/Z7)" + $SuppressStartupBanner + $WarningLevel "Level 4 (/W4)" + $Detect64bitPortabilityIssues "Yes (/Wp64)" + $TreatWarningsAsErrors + $UseUNICODEResponseFiles "No" + + // Optimization + $Optimization "Maximize Speed (/O2)" + $InlineFunctionExpansion "Any Suitable (/Ob2)" + $EnableIntrinsicFunctions "Yes (/Oi)" + $FavorSizeOrSpeed "Favor Fast Code (/Ot)" + $OmitFramePointers + $EnableFiberSafeOptimizations + $WholeProgramOptimization + + // Preprocessor + $PreprocessorDefinitions "$BASE;WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + $PreprocessorDefinitions "$BASE;RELEASE_ASSERTS" [$RELEASEASSERTS] + $IgnoreStandardIncludePath + $GeneratePreprocessedFile + $KeepComments + + // Code Generation + $EnableStringPooling "Yes (/GF)" + $EnableMinimalRebuild + $EnableC++Exceptions "No" + $SmallerTypeCheck + $BasicRuntimeChecks + $RuntimeLibrary "Multi-threaded (/MT)" + $StructMemberAlignment + $BufferSecurityCheck "No" [$RETAIL] + $BufferSecurityCheck "Yes" [!$RETAIL] + $EnableFunctionLevelLinking "Yes (/Gy)" + $EnableEnhancedInstructionSet + $FloatingPointModel "Fast (/fp:fast)" + $EnableFloatingPointExceptions + + // Language + $DisableLanguageExtensions + $DefaultCharUnsigned + $TreatWCHAR_TAsBuiltInType "Yes (/Zc:wchar_t)" + $ForceConformanceInForLoopScope "Yes (/Zc:forScope)" + $EnableRunTimeTypeInfo "Yes (/GR)" + $OpenMPSupport "No" + + // Precompiled Headers + $Create/UsePrecompiledHeader "Not Using Precompiled Headers" + $Create/UsePCHThroughFile + $PrecompiledHeaderFile + + // Output Files + $ExpandAttributedSource "No" + $AssemblerOutput "No Listing" + $ASMListLocation "$(IntDir)/" + $ObjectFileName "$(IntDir)/" + $ProgramDatabaseFileName "$(IntDir)/" + $GenerateXMLDocumentationFiles "No" + $XMLDocumentationFileName + + // Browse Information + $EnableBrowseInformation "None" + $BrowseFile "$(IntDir)/" + + // Advanced + $CallingConvention + $CompileAs "Compile as C++ Code (/TP)" + $DisableSpecificWarnings + $ForceIncludes + $Force#Using + $ShowIncludes + $UndefinePreprocessorDefinitions + $UndefineAllPreprocessorDefinitions + $UseFullPaths "Yes (/FC)" + $OmitDefaultLibraryNames + $ErrorReporting "Prompt Immediately (/errorReport:prompt)" + + // Command Line (L4D adding /MP) + $AdditionalOptions "/MP" + // Enable extra debugging information. + $AdditionalOptions "$BASE /d2Zi+" [$VS2010] + $AdditionalOptions "$BASE /Oy-" [$NOFPO] + } + + $Librarian + { + // General + $OutputFile "$OUTLIBDIR\$OUTLIBNAME.lib" + $AdditionalDependencies + $AdditionalLibraryDirectories + $SuppressStartupBanner "Yes (/NOLOGO)" + $ModuleDefinitionFileName + $IgnoreAllDefaultLibraries + $IgnoreSpecificLibrary + $ExportNamedFunctions + $ForceSymbolReferences + $UseUNICODEResponseFiles "No" + $LinkLibraryDependencies + + // Command Line + $AdditionalOptions + } + + $XMLDocumentGenerator + { + // General + $SuppressStartupBanner "Yes (/nologo)" + $ValidateIntelliSense + $AdditionalDocumentFiles + $OutputDocumentFile + $DocumentLibraryDependencies + $UseUNICODEResponseFiles + } + + $BrowseInformation + { + $SuppressStartupBanner "Yes (/nologo)" + $OutputFile "$(OutDir)/$OUTLIBNAME.bsc" + $AdditionalOptions + } + + $PreBuildEvent + { + $CommandLine + $Description + $ExcludedFromBuild "No" + } + + $PreLinkEvent + { + $CommandLine + $Description + $ExcludedFromBuild "No" + } + + $PostBuildEvent + { + $CommandLine + $Description + $ExcludedFromBuild "No" + } + + $CustomBuildStep + { + // General + $CommandLine + $Description + $Outputs + $AdditionalDependencies + } +} -- cgit v1.2.3