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_base.vpc | 39 ++++++++++++---------------- 1 file changed, 16 insertions(+), 23 deletions(-) (limited to 'mp/src/vpc_scripts/source_lib_win32_base.vpc') diff --git a/mp/src/vpc_scripts/source_lib_win32_base.vpc b/mp/src/vpc_scripts/source_lib_win32_base.vpc index e2f6766e..b775614c 100644 --- a/mp/src/vpc_scripts/source_lib_win32_base.vpc +++ b/mp/src/vpc_scripts/source_lib_win32_base.vpc @@ -6,15 +6,12 @@ $Include "$SRCDIR\vpc_scripts\version.vpc" -$Macro NOAPPENDPLATSUBDIR "1" [!$WIN64] - -$MacroRequired "PLATSUBDIR" $MacroRequired "SRCDIR" $MacroRequired "OUTLIBNAME" "$PROJECTNAME" $MacroRequired "OUTLIBDIR" -// Fix up directories for targets like win64 -$Macro OUTLIBDIR "$OUTLIBDIR$PLATSUBDIR" [!$NOAPPENDPLATSUBDIR] +$Macro LIBPUBLIC "$SRCDIR\lib\public$PLATSUBDIR" +$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" $Include "$SRCDIR\vpc_scripts\source_lib_win32_debug.vpc" $Include "$SRCDIR\vpc_scripts\source_lib_win32_release.vpc" @@ -25,38 +22,41 @@ $IgnoreRedundancyWarning "ON" // Common Configuration $Configuration { - $General [$VS2010] + $General [$VS2010] { - $TargetName "$OUTLIBNAME" + $TargetName "$OUTLIBNAME" } - $General - { - $OutputDirectory "$OUTLIBDIR" - } $Compiler { + $PreprocessorDefinitions "$BASE;PLATFORM_64BITS;WIN64;_WIN64;COMPILER_MSVC64" [$WIN64] + $PreprocessorDefinitions "$BASE;COMPILER_MSVC32" [$WIN32] + $PreprocessorDefinitions "$BASE;COMPILER_MSVC;_DLL_EXT=$_DLL_EXT" $PreprocessorDefinitions "$BASE;LIBNAME=$OUTLIBNAME" - $PreprocessorDefinitions "$BASE;RAD_TELEMETRY_DISABLED" [$SOURCESDK] + } + + $Compiler [$WIN32] + { + $EnableEnhancedInstructionSet "Streaming SIMD Extensions 2 (/arch:SSE2)" } $PreBuildEvent { $CommandLine "if EXIST $OUTLIBDIR\$(TargetName).lib ( for /f $QUOTEdelims=$QUOTE %%A in ('attrib $QUOTE$OUTLIBDIR\$(TargetName).lib$QUOTE') do set valveTmpIsReadOnly=$QUOTE%%A$QUOTE" "\n" \ - ") else ( mkdir $OUTLIBDIR )" "\n" \ + ") else ( if not EXIST $OUTLIBDIR mkdir $OUTLIBDIR )" "\n" \ "set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1%" "\n" \ "if $QUOTE%valveTmpIsReadOnlyLetter%$QUOTE==$QUOTER$QUOTE (" "\n" \ " attrib -r $OUTLIBDIR\$(TargetName).lib" "\n" \ " $SRCDIR\devtools\bin\gnu\touch.exe -d $QUOTE1999-01-01$QUOTE $OUTLIBDIR\$(TargetName).lib" "\n" \ " attrib +r $OUTLIBDIR\$(TargetName).lib" "\n" \ ")" "\n" \ - "$CRCCHECK" "\n" [!$SOURCESDK] + "$CRCCHECK" "\n" } - $PreLinkEvent + $PreLinkEvent [!$ANALYZE && !$SOURCESDK] { - $CommandLine "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTLIBDIR\$(TargetName).lib $SRCDIR" [!$SOURCESDK ] + $CommandLine "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTLIBDIR\$(TargetName).lib $SRCDIR" } $Librarian @@ -64,13 +64,6 @@ $Configuration // Suppress this warning using the undocumented /ignore linker switch // schemalib.lib(schemaclassinfo.obj) : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library $AdditionalOptions "$BASE /ignore:4221" - - // This option is from the devil. Basically, it causes the link inputs - // to vary depending on what is in the solution. This is anathema - // to the way that we use projects and solutions here at Valve. - // It also exposes a bug in VS2005 causing files to be recompiled/linked - // even if nothing changed. - $LinkLibraryDependencies "false" } } -- 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_base.vpc | 172 +++++++++++++-------------- 1 file changed, 86 insertions(+), 86 deletions(-) (limited to 'mp/src/vpc_scripts/source_lib_win32_base.vpc') diff --git a/mp/src/vpc_scripts/source_lib_win32_base.vpc b/mp/src/vpc_scripts/source_lib_win32_base.vpc index b775614c..0eb822ab 100644 --- a/mp/src/vpc_scripts/source_lib_win32_base.vpc +++ b/mp/src/vpc_scripts/source_lib_win32_base.vpc @@ -1,86 +1,86 @@ -//----------------------------------------------------------------------------- -// SOURCE_LIB_WIN32_BASE.VPC -// -// Base Settings for all Source(TM) Projects -//----------------------------------------------------------------------------- - -$Include "$SRCDIR\vpc_scripts\version.vpc" - -$MacroRequired "SRCDIR" -$MacroRequired "OUTLIBNAME" "$PROJECTNAME" -$MacroRequired "OUTLIBDIR" - -$Macro LIBPUBLIC "$SRCDIR\lib\public$PLATSUBDIR" -$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" - -$Include "$SRCDIR\vpc_scripts\source_lib_win32_debug.vpc" -$Include "$SRCDIR\vpc_scripts\source_lib_win32_release.vpc" -$Include "$SRCDIR\vpc_scripts\source_win32_base.vpc" - -$IgnoreRedundancyWarning "ON" - -// Common Configuration -$Configuration -{ - $General [$VS2010] - { - $TargetName "$OUTLIBNAME" - } - - - $Compiler - { - $PreprocessorDefinitions "$BASE;PLATFORM_64BITS;WIN64;_WIN64;COMPILER_MSVC64" [$WIN64] - $PreprocessorDefinitions "$BASE;COMPILER_MSVC32" [$WIN32] - $PreprocessorDefinitions "$BASE;COMPILER_MSVC;_DLL_EXT=$_DLL_EXT" - $PreprocessorDefinitions "$BASE;LIBNAME=$OUTLIBNAME" - } - - $Compiler [$WIN32] - { - $EnableEnhancedInstructionSet "Streaming SIMD Extensions 2 (/arch:SSE2)" - } - - $PreBuildEvent - { - $CommandLine "if EXIST $OUTLIBDIR\$(TargetName).lib ( for /f $QUOTEdelims=$QUOTE %%A in ('attrib $QUOTE$OUTLIBDIR\$(TargetName).lib$QUOTE') do set valveTmpIsReadOnly=$QUOTE%%A$QUOTE" "\n" \ - ") else ( if not EXIST $OUTLIBDIR mkdir $OUTLIBDIR )" "\n" \ - "set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1%" "\n" \ - "if $QUOTE%valveTmpIsReadOnlyLetter%$QUOTE==$QUOTER$QUOTE (" "\n" \ - " attrib -r $OUTLIBDIR\$(TargetName).lib" "\n" \ - " $SRCDIR\devtools\bin\gnu\touch.exe -d $QUOTE1999-01-01$QUOTE $OUTLIBDIR\$(TargetName).lib" "\n" \ - " attrib +r $OUTLIBDIR\$(TargetName).lib" "\n" \ - ")" "\n" \ - "$CRCCHECK" "\n" - } - - $PreLinkEvent [!$ANALYZE && !$SOURCESDK] - { - $CommandLine "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTLIBDIR\$(TargetName).lib $SRCDIR" - } - - $Librarian - { - // Suppress this warning using the undocumented /ignore linker switch - // schemalib.lib(schemaclassinfo.obj) : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library - $AdditionalOptions "$BASE /ignore:4221" - } -} - -// Skeleton Project - All derived projects get this as a starting base -$Project -{ - $Folder "Source Files" - { - $File "$SRCDIR\common\debug_lib_check.cpp" [!$SOURCESDK] - { - $Configuration - { - $Compiler - { - $Create/UsePrecompiledHeader "Not Using Precompiled Headers" - } - } - } - } -} +//----------------------------------------------------------------------------- +// SOURCE_LIB_WIN32_BASE.VPC +// +// Base Settings for all Source(TM) Projects +//----------------------------------------------------------------------------- + +$Include "$SRCDIR\vpc_scripts\version.vpc" + +$MacroRequired "SRCDIR" +$MacroRequired "OUTLIBNAME" "$PROJECTNAME" +$MacroRequired "OUTLIBDIR" + +$Macro LIBPUBLIC "$SRCDIR\lib\public$PLATSUBDIR" +$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" + +$Include "$SRCDIR\vpc_scripts\source_lib_win32_debug.vpc" +$Include "$SRCDIR\vpc_scripts\source_lib_win32_release.vpc" +$Include "$SRCDIR\vpc_scripts\source_win32_base.vpc" + +$IgnoreRedundancyWarning "ON" + +// Common Configuration +$Configuration +{ + $General [$VS2010] + { + $TargetName "$OUTLIBNAME" + } + + + $Compiler + { + $PreprocessorDefinitions "$BASE;PLATFORM_64BITS;WIN64;_WIN64;COMPILER_MSVC64" [$WIN64] + $PreprocessorDefinitions "$BASE;COMPILER_MSVC32" [$WIN32] + $PreprocessorDefinitions "$BASE;COMPILER_MSVC;_DLL_EXT=$_DLL_EXT" + $PreprocessorDefinitions "$BASE;LIBNAME=$OUTLIBNAME" + } + + $Compiler [$WIN32] + { + $EnableEnhancedInstructionSet "Streaming SIMD Extensions 2 (/arch:SSE2)" + } + + $PreBuildEvent + { + $CommandLine "if EXIST $OUTLIBDIR\$(TargetName).lib ( for /f $QUOTEdelims=$QUOTE %%A in ('attrib $QUOTE$OUTLIBDIR\$(TargetName).lib$QUOTE') do set valveTmpIsReadOnly=$QUOTE%%A$QUOTE" "\n" \ + ") else ( if not EXIST $OUTLIBDIR mkdir $OUTLIBDIR )" "\n" \ + "set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1%" "\n" \ + "if $QUOTE%valveTmpIsReadOnlyLetter%$QUOTE==$QUOTER$QUOTE (" "\n" \ + " attrib -r $OUTLIBDIR\$(TargetName).lib" "\n" \ + " $SRCDIR\devtools\bin\gnu\touch.exe -d $QUOTE1999-01-01$QUOTE $OUTLIBDIR\$(TargetName).lib" "\n" \ + " attrib +r $OUTLIBDIR\$(TargetName).lib" "\n" \ + ")" "\n" \ + "$CRCCHECK" "\n" + } + + $PreLinkEvent [!$ANALYZE && !$SOURCESDK] + { + $CommandLine "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTLIBDIR\$(TargetName).lib $SRCDIR" + } + + $Librarian + { + // Suppress this warning using the undocumented /ignore linker switch + // schemalib.lib(schemaclassinfo.obj) : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library + $AdditionalOptions "$BASE /ignore:4221" + } +} + +// Skeleton Project - All derived projects get this as a starting base +$Project +{ + $Folder "Source Files" + { + $File "$SRCDIR\common\debug_lib_check.cpp" [!$SOURCESDK] + { + $Configuration + { + $Compiler + { + $Create/UsePrecompiledHeader "Not Using Precompiled Headers" + } + } + } + } +} -- cgit v1.2.3