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/height2normal/height2normal.vpc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/mp/src/utils/height2normal/height2normal.vpc b/mp/src/utils/height2normal/height2normal.vpc
index d6379a6d..dc1cb73b 100644
--- a/mp/src/utils/height2normal/height2normal.vpc
+++ b/mp/src/utils/height2normal/height2normal.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
 {
@@ -34,8 +34,8 @@ $Project "Height2normal"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\bitmap.lib"
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
+		$Lib bitmap
+		$Lib mathlib
+		$Lib tier2
 	}
 }
-- 
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/height2normal/height2normal.vpc | 82 ++++++++++++++--------------
 1 file changed, 41 insertions(+), 41 deletions(-)

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

diff --git a/mp/src/utils/height2normal/height2normal.vpc b/mp/src/utils/height2normal/height2normal.vpc
index dc1cb73b..be330ee4 100644
--- a/mp/src/utils/height2normal/height2normal.vpc
+++ b/mp/src/utils/height2normal/height2normal.vpc
@@ -1,41 +1,41 @@
-//-----------------------------------------------------------------------------
-//	HEIGHT2NORMAL.VPC
-//
-//	Project Script
-//-----------------------------------------------------------------------------
-
-$Macro SRCDIR		"..\.."
-$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
-
-$Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc"
-
-$Configuration
-{
-	$Compiler
-	{
-		$AdditionalIncludeDirectories		"$BASE,..\common"
-		$PreprocessorDefinitions			"_HAS_ITERATOR_DEBUGGING=0;_DEBUG;_WIN32;_CONSOLE"
-	}
-}
-
-$Project "Height2normal"
-{
-	$Folder	"Source Files"
-	{
-		-$File	"$SRCDIR\public\tier0\memoverride.cpp"
-		$File	"height2normal.cpp"
-	}
-
-	$Folder	"Header Files"
-	{
-		$File	"$SRCDIR\public\tier1\interface.h"
-		$File	"$SRCDIR\public\tier1\utlbuffer.h"
-	}
-
-	$Folder	"Link Libraries"
-	{
-		$Lib bitmap
-		$Lib mathlib
-		$Lib tier2
-	}
-}
+//-----------------------------------------------------------------------------
+//	HEIGHT2NORMAL.VPC
+//
+//	Project Script
+//-----------------------------------------------------------------------------
+
+$Macro SRCDIR		"..\.."
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
+
+$Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc"
+
+$Configuration
+{
+	$Compiler
+	{
+		$AdditionalIncludeDirectories		"$BASE,..\common"
+		$PreprocessorDefinitions			"_HAS_ITERATOR_DEBUGGING=0;_DEBUG;_WIN32;_CONSOLE"
+	}
+}
+
+$Project "Height2normal"
+{
+	$Folder	"Source Files"
+	{
+		-$File	"$SRCDIR\public\tier0\memoverride.cpp"
+		$File	"height2normal.cpp"
+	}
+
+	$Folder	"Header Files"
+	{
+		$File	"$SRCDIR\public\tier1\interface.h"
+		$File	"$SRCDIR\public\tier1\utlbuffer.h"
+	}
+
+	$Folder	"Link Libraries"
+	{
+		$Lib bitmap
+		$Lib mathlib
+		$Lib tier2
+	}
+}
-- 
cgit v1.2.3