From a0c29e7dd67abb15c74c85f07741784877edfdcd Mon Sep 17 00:00:00 2001
From: Joe Ludwig <joe@valvesoftware.com>
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_dll_base.vpc | 37 +++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'mp/src/vpc_scripts/source_dll_base.vpc')

diff --git a/mp/src/vpc_scripts/source_dll_base.vpc b/mp/src/vpc_scripts/source_dll_base.vpc
index b2c07984..c4b73b97 100644
--- a/mp/src/vpc_scripts/source_dll_base.vpc
+++ b/mp/src/vpc_scripts/source_dll_base.vpc
@@ -1,20 +1,25 @@
-//-----------------------------------------------------------------------------
-//	source_dll_base.VPC
-//
-//	Project Script
-//-----------------------------------------------------------------------------
-
+$MacroRequired		"OUTDLLEXT" "$_DLL_EXT"
+$Include "$SRCDIR\vpc_scripts\platform_dirs.vpc"
 $include "$SRCDIR\vpc_scripts\source_base.vpc"
 
-$Macro PLATSUBDIR	"\linux32" [$LINUX32]
-$Macro PLATSUBDIR	"\osx32" [$OSX32]
-$Macro OUTBINDIR	"$OUTBINDIR" [$LINUX32]
-$Macro LIBPUBLIC	"$SRCDIR\lib\public$PLATSUBDIR" [$LINUX32]
-$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR" [$LINUX32]
-
-$include "$SRCDIR\vpc_scripts\source_dll_win32_base.vpc"	[$WINDOWS]
-$include "$SRCDIR\vpc_scripts\source_dll_x360_base.vpc"	[$X360]
-$include "$SRCDIR\vpc_scripts\source_dll_posix_base.vpc"	[$OSXALL]
-$Include "$SRCDIR\vpc_scripts\source_dll_linux_base.vpc"	[$LINUX]
+$include "$SRCDIR\vpc_scripts\source_dll_posix_base.vpc"	[$POSIX]
+$Include "$SRCDIR\vpc_scripts\source_dll_win32_base.vpc"	[( $WIN32 || $WIN64 ) && !$POSIX]
+$Include "$SRCDIR\vpc_scripts\source_dll_x360_base.vpc"		[$X360]
+$Include "$SRCDIR\vpc_scripts\source_ppu_prx_ps3_base.vpc"	[$PS3]
 $Include "$SRCDIR\vpc_scripts\source_video_base.vpc"
 
+$Configuration
+{
+	$General	[$VS2010]
+	{
+		$TargetExtension	"$OUTDLLEXT"
+	}
+
+	$Compiler
+	{
+		$PreprocessorDefinitions			"$BASE;DEV_BUILD"						[!$PUBLISH]
+		$PreprocessorDefinitions			"$BASE;_PROFILE"						[$PROFILE && !$RETAIL]
+		$PreprocessorDefinitions			"$BASE;RETAIL_ASSERTS"					[$RETAIL && $RETAILASSERTS]
+		$PreprocessorDefinitions			"$BASE;FRAME_POINTER_OMISSION_DISABLED"	[$NOFPO || $VS2010]
+	}
+}
-- 
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?= <jorgenpt@gmail.com>
Date: Mon, 2 Dec 2013 19:31:46 -0800
Subject: Fix line endings. WHAMMY.

---
 mp/src/vpc_scripts/source_dll_base.vpc | 50 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'mp/src/vpc_scripts/source_dll_base.vpc')

diff --git a/mp/src/vpc_scripts/source_dll_base.vpc b/mp/src/vpc_scripts/source_dll_base.vpc
index c4b73b97..16e565ec 100644
--- a/mp/src/vpc_scripts/source_dll_base.vpc
+++ b/mp/src/vpc_scripts/source_dll_base.vpc
@@ -1,25 +1,25 @@
-$MacroRequired		"OUTDLLEXT" "$_DLL_EXT"
-$Include "$SRCDIR\vpc_scripts\platform_dirs.vpc"
-$include "$SRCDIR\vpc_scripts\source_base.vpc"
-
-$include "$SRCDIR\vpc_scripts\source_dll_posix_base.vpc"	[$POSIX]
-$Include "$SRCDIR\vpc_scripts\source_dll_win32_base.vpc"	[( $WIN32 || $WIN64 ) && !$POSIX]
-$Include "$SRCDIR\vpc_scripts\source_dll_x360_base.vpc"		[$X360]
-$Include "$SRCDIR\vpc_scripts\source_ppu_prx_ps3_base.vpc"	[$PS3]
-$Include "$SRCDIR\vpc_scripts\source_video_base.vpc"
-
-$Configuration
-{
-	$General	[$VS2010]
-	{
-		$TargetExtension	"$OUTDLLEXT"
-	}
-
-	$Compiler
-	{
-		$PreprocessorDefinitions			"$BASE;DEV_BUILD"						[!$PUBLISH]
-		$PreprocessorDefinitions			"$BASE;_PROFILE"						[$PROFILE && !$RETAIL]
-		$PreprocessorDefinitions			"$BASE;RETAIL_ASSERTS"					[$RETAIL && $RETAILASSERTS]
-		$PreprocessorDefinitions			"$BASE;FRAME_POINTER_OMISSION_DISABLED"	[$NOFPO || $VS2010]
-	}
-}
+$MacroRequired		"OUTDLLEXT" "$_DLL_EXT"
+$Include "$SRCDIR\vpc_scripts\platform_dirs.vpc"
+$include "$SRCDIR\vpc_scripts\source_base.vpc"
+
+$include "$SRCDIR\vpc_scripts\source_dll_posix_base.vpc"	[$POSIX]
+$Include "$SRCDIR\vpc_scripts\source_dll_win32_base.vpc"	[( $WIN32 || $WIN64 ) && !$POSIX]
+$Include "$SRCDIR\vpc_scripts\source_dll_x360_base.vpc"		[$X360]
+$Include "$SRCDIR\vpc_scripts\source_ppu_prx_ps3_base.vpc"	[$PS3]
+$Include "$SRCDIR\vpc_scripts\source_video_base.vpc"
+
+$Configuration
+{
+	$General	[$VS2010]
+	{
+		$TargetExtension	"$OUTDLLEXT"
+	}
+
+	$Compiler
+	{
+		$PreprocessorDefinitions			"$BASE;DEV_BUILD"						[!$PUBLISH]
+		$PreprocessorDefinitions			"$BASE;_PROFILE"						[$PROFILE && !$RETAIL]
+		$PreprocessorDefinitions			"$BASE;RETAIL_ASSERTS"					[$RETAIL && $RETAILASSERTS]
+		$PreprocessorDefinitions			"$BASE;FRAME_POINTER_OMISSION_DISABLED"	[$NOFPO || $VS2010]
+	}
+}
-- 
cgit v1.2.3