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/utils/captioncompiler/captioncompiler.vpc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'mp/src/utils/captioncompiler/captioncompiler.vpc')

diff --git a/mp/src/utils/captioncompiler/captioncompiler.vpc b/mp/src/utils/captioncompiler/captioncompiler.vpc
index 6d60fabe..a6af7a7b 100644
--- a/mp/src/utils/captioncompiler/captioncompiler.vpc
+++ b/mp/src/utils/captioncompiler/captioncompiler.vpc
@@ -7,7 +7,7 @@
 $Macro SRCDIR		"..\.."
 $Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
-$Include "$SRCDIR\vpc_scripts\source_exe_con_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc"
 
 $Configuration
 {
@@ -52,9 +52,9 @@ $Project "Captioncompiler"
 
 	$Folder "Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\appframework.lib"
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier3.lib"
+		$Lib appframework
+		$Lib mathlib
+		$Lib tier2
+		$Lib tier3
 	}
 }
-- 
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/utils/captioncompiler/captioncompiler.vpc | 120 +++++++++++------------
 1 file changed, 60 insertions(+), 60 deletions(-)

(limited to 'mp/src/utils/captioncompiler/captioncompiler.vpc')

diff --git a/mp/src/utils/captioncompiler/captioncompiler.vpc b/mp/src/utils/captioncompiler/captioncompiler.vpc
index a6af7a7b..da5a3b4e 100644
--- a/mp/src/utils/captioncompiler/captioncompiler.vpc
+++ b/mp/src/utils/captioncompiler/captioncompiler.vpc
@@ -1,60 +1,60 @@
-//-----------------------------------------------------------------------------
-//	CAPTIONCOMPILER.VPC
-//
-//	Project Script
-//-----------------------------------------------------------------------------
-
-$Macro SRCDIR		"..\.."
-$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
-
-$Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc"
-
-$Configuration
-{
-	$Compiler
-	{
-		$AdditionalIncludeDirectories		"$BASE,..\common,$SRCDIR\game\shared,.\"
-		$PreprocessorDefinitions			"$BASE;captioncompiler"
-	}
-}
-
-$Project "Captioncompiler"
-{
-	$Folder	"Source Files"
-	{
-		$File	"captioncompiler.cpp"
-		$File	"$SRCDIR\common\compiledcaptionswap.cpp"
-		$File	"..\common\filesystem_tools.cpp"
-	}
-
-	$Folder	"Header Files"
-	{
-		$File	"cbase.h"
-		$File	"..\common\filesystem_tools.h"
-	}
-
-	$Folder	"Shared Code"
-	{
-		$File	"..\common\cmdlib.cpp"
-		$File	"..\common\cmdlib.h"
-		$File	"$SRCDIR\public\filesystem_helpers.cpp"
-		$File	"$SRCDIR\public\filesystem_helpers.h"
-		$File	"$SRCDIR\public\filesystem_init.cpp"
-		$File	"$SRCDIR\public\filesystem_init.h"
-		$File	"$SRCDIR\public\mathlib\mathlib.h"
-		$File	"..\common\pacifier.cpp"
-		$File	"..\common\pacifier.h"
-		$File	"..\common\scriplib.cpp"
-		$File	"..\common\scriplib.h"
-		$File	"$SRCDIR\public\stringregistry.cpp"
-		$File	"$SRCDIR\public\stringregistry.h"
-	}
-
-	$Folder "Link Libraries"
-	{
-		$Lib appframework
-		$Lib mathlib
-		$Lib tier2
-		$Lib tier3
-	}
-}
+//-----------------------------------------------------------------------------
+//	CAPTIONCOMPILER.VPC
+//
+//	Project Script
+//-----------------------------------------------------------------------------
+
+$Macro SRCDIR		"..\.."
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
+
+$Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc"
+
+$Configuration
+{
+	$Compiler
+	{
+		$AdditionalIncludeDirectories		"$BASE,..\common,$SRCDIR\game\shared,.\"
+		$PreprocessorDefinitions			"$BASE;captioncompiler"
+	}
+}
+
+$Project "Captioncompiler"
+{
+	$Folder	"Source Files"
+	{
+		$File	"captioncompiler.cpp"
+		$File	"$SRCDIR\common\compiledcaptionswap.cpp"
+		$File	"..\common\filesystem_tools.cpp"
+	}
+
+	$Folder	"Header Files"
+	{
+		$File	"cbase.h"
+		$File	"..\common\filesystem_tools.h"
+	}
+
+	$Folder	"Shared Code"
+	{
+		$File	"..\common\cmdlib.cpp"
+		$File	"..\common\cmdlib.h"
+		$File	"$SRCDIR\public\filesystem_helpers.cpp"
+		$File	"$SRCDIR\public\filesystem_helpers.h"
+		$File	"$SRCDIR\public\filesystem_init.cpp"
+		$File	"$SRCDIR\public\filesystem_init.h"
+		$File	"$SRCDIR\public\mathlib\mathlib.h"
+		$File	"..\common\pacifier.cpp"
+		$File	"..\common\pacifier.h"
+		$File	"..\common\scriplib.cpp"
+		$File	"..\common\scriplib.h"
+		$File	"$SRCDIR\public\stringregistry.cpp"
+		$File	"$SRCDIR\public\stringregistry.h"
+	}
+
+	$Folder "Link Libraries"
+	{
+		$Lib appframework
+		$Lib mathlib
+		$Lib tier2
+		$Lib tier3
+	}
+}
-- 
cgit v1.2.3