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 +++++-----
 mp/src/utils/glview/glview.vpc                          |  6 +++---
 mp/src/utils/height2normal/height2normal.vpc            |  8 ++++----
 mp/src/utils/motionmapper/motionmapper.vpc              |  8 ++++----
 mp/src/utils/phonemeextractor/phonemeextractor.vpc      |  4 ++--
 mp/src/utils/phonemeextractor/phonemeextractor_ims.vpc  |  4 ++--
 mp/src/utils/qc_eyes/qc_eyes.vpc                        |  2 +-
 mp/src/utils/serverplugin_sample/serverplugin_empty.vpc |  8 ++------
 mp/src/utils/tgadiff/tgadiff.vpc                        |  8 ++++----
 mp/src/utils/vbsp/vbsp.vpc                              | 12 ++++++------
 mp/src/utils/vice/vice.vpc                              |  6 +++---
 mp/src/utils/vrad/vrad_dll.vpc                          | 14 +++++++-------
 mp/src/utils/vrad_launcher/vrad_launcher.vpc            |  2 +-
 mp/src/utils/vtf2tga/vtf2tga.vpc                        | 10 +++++-----
 mp/src/utils/vtfdiff/vtfdiff.vpc                        | 10 +++++-----
 mp/src/utils/vvis/vvis_dll.vpc                          |  8 ++++----
 mp/src/utils/vvis_launcher/vvis_launcher.vpc            |  2 +-
 17 files changed, 59 insertions(+), 63 deletions(-)

(limited to 'mp/src/utils')

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
 	}
 }
diff --git a/mp/src/utils/glview/glview.vpc b/mp/src/utils/glview/glview.vpc
index b645cfde..3045d128 100644
--- a/mp/src/utils/glview/glview.vpc
+++ b/mp/src/utils/glview/glview.vpc
@@ -7,7 +7,7 @@
 $Macro SRCDIR		"..\.."
 $Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
-$Include "$SRCDIR\vpc_scripts\source_exe_win_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_exe_base.vpc"
 
 $Configuration
 {
@@ -49,7 +49,7 @@ $Project "Glview"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
+		$Lib mathlib
+		$Lib tier2
 	}
 }
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
 	}
 }
diff --git a/mp/src/utils/motionmapper/motionmapper.vpc b/mp/src/utils/motionmapper/motionmapper.vpc
index 0a59a92d..1272c040 100644
--- a/mp/src/utils/motionmapper/motionmapper.vpc
+++ b/mp/src/utils/motionmapper/motionmapper.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
 {
@@ -81,8 +81,8 @@ $Project "Motionmapper"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\nvtristrip.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
+		$Lib mathlib
+		$Lib nvtristrip
+		$Lib tier2
 	}
 }
diff --git a/mp/src/utils/phonemeextractor/phonemeextractor.vpc b/mp/src/utils/phonemeextractor/phonemeextractor.vpc
index 160fe8d8..f6e82e4d 100644
--- a/mp/src/utils/phonemeextractor/phonemeextractor.vpc
+++ b/mp/src/utils/phonemeextractor/phonemeextractor.vpc
@@ -7,7 +7,7 @@
 $Macro SRCDIR		"..\.."
 $Macro OUTBINDIR	"$SRCDIR\..\game\bin\phonemeextractors"
 
-$Include "$SRCDIR\vpc_scripts\source_dll_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 
 $Configuration
 {
@@ -77,7 +77,7 @@ $Project "Phonemeextractor"
 	
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
+		$Lib mathlib
 		$DynamicFile	"..\sapi51\lib\i386\sapi.lib"
 	}
 }
diff --git a/mp/src/utils/phonemeextractor/phonemeextractor_ims.vpc b/mp/src/utils/phonemeextractor/phonemeextractor_ims.vpc
index 135ac216..e3df0327 100644
--- a/mp/src/utils/phonemeextractor/phonemeextractor_ims.vpc
+++ b/mp/src/utils/phonemeextractor/phonemeextractor_ims.vpc
@@ -7,7 +7,7 @@
 $Macro SRCDIR		"..\.."
 $Macro OUTBINDIR	"$SRCDIR\..\game\bin\phonemeextractors"
 
-$Include "$SRCDIR\vpc_scripts\source_dll_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 
 $Configuration
 {
@@ -92,7 +92,7 @@ $Project "Phonemeextractor_ims"
 	
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
+		$Lib mathlib
 		$File	"..\sapi51\lib\i386\sapi.lib"
 	}
 }
diff --git a/mp/src/utils/qc_eyes/qc_eyes.vpc b/mp/src/utils/qc_eyes/qc_eyes.vpc
index 3873b59a..54b35528 100644
--- a/mp/src/utils/qc_eyes/qc_eyes.vpc
+++ b/mp/src/utils/qc_eyes/qc_eyes.vpc
@@ -7,7 +7,7 @@
 $Macro SRCDIR		"..\.."
 $Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
-$Include "$SRCDIR\vpc_scripts\source_exe_win_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_exe_base.vpc"
 
 $Configuration
 {
diff --git a/mp/src/utils/serverplugin_sample/serverplugin_empty.vpc b/mp/src/utils/serverplugin_sample/serverplugin_empty.vpc
index 66bdd80f..a4bc5380 100644
--- a/mp/src/utils/serverplugin_sample/serverplugin_empty.vpc
+++ b/mp/src/utils/serverplugin_sample/serverplugin_empty.vpc
@@ -56,11 +56,7 @@ $Project "Serverplugin_empty"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib" [$WIN32]
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib" [$WIN32]
-		$DynamicFile	"$SRCDIR\lib\public\$PLATFORM\mathlib$_STATICLIB_EXT" [$LINUX]
-		$DynamicFile	"$SRCDIR\lib\public\$PLATFORM\tier2$_STATICLIB_EXT" [$LINUX]
-		$DynamicFile	"$SRCDIR\lib\$PLATFORM\mathlib$_STATICLIB_EXT" [$OSXALL]
-		$DynamicFile	"$SRCDIR\lib\$PLATFORM\tier2$_STATICLIB_EXT" [$OSXALL]
+		$Lib mathlib
+		$Lib tier2
 	}
 }
diff --git a/mp/src/utils/tgadiff/tgadiff.vpc b/mp/src/utils/tgadiff/tgadiff.vpc
index 6338b77f..1bfc6b1f 100644
--- a/mp/src/utils/tgadiff/tgadiff.vpc
+++ b/mp/src/utils/tgadiff/tgadiff.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"
 
 $Project "Tgadiff"
 {
@@ -18,8 +18,8 @@ $Project "Tgadiff"
 
 	$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
 	}
 }
diff --git a/mp/src/utils/vbsp/vbsp.vpc b/mp/src/utils/vbsp/vbsp.vpc
index 10fc9db1..4c6d1862 100644
--- a/mp/src/utils/vbsp/vbsp.vpc
+++ b/mp/src/utils/vbsp/vbsp.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
 {
@@ -173,11 +173,11 @@ $Project "Vbsp"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\bitmap.lib"
-		$DynamicFile	"$SRCDIR\lib\public\fgdlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
-		$DynamicFile	"$SRCDIR\lib\public\vtf.lib"
+		$Lib bitmap
+		$Lib fgdlib
+		$Lib mathlib
+		$Lib tier2
+		$Lib vtf
 	}
 
 	$File	"notes.txt"
diff --git a/mp/src/utils/vice/vice.vpc b/mp/src/utils/vice/vice.vpc
index 31e51b23..8a87d0bb 100644
--- a/mp/src/utils/vice/vice.vpc
+++ b/mp/src/utils/vice/vice.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
 {
@@ -35,7 +35,7 @@ $Project "Vice"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
+		$Lib tier2
+		$Lib mathlib
 	}
 }
diff --git a/mp/src/utils/vrad/vrad_dll.vpc b/mp/src/utils/vrad/vrad_dll.vpc
index 1b0c1c1f..02fb290a 100644
--- a/mp/src/utils/vrad/vrad_dll.vpc
+++ b/mp/src/utils/vrad/vrad_dll.vpc
@@ -7,7 +7,7 @@
 $Macro SRCDIR		"..\.."
 $Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
-$Include "$SRCDIR\vpc_scripts\source_dll_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 
 $Configuration
 {
@@ -213,12 +213,12 @@ $Project "Vrad_dll"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\bitmap.lib"
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\raytrace.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
-		$DynamicFile	"$SRCDIR\lib\public\vmpi.lib"
-		$DynamicFile	"$SRCDIR\lib\public\vtf.lib"
+		$Lib bitmap
+		$Lib mathlib
+		$Lib raytrace
+		$Lib tier2
+		$Lib vmpi
+		$Lib vtf
 	}
 
 	$File	"notes.txt"
diff --git a/mp/src/utils/vrad_launcher/vrad_launcher.vpc b/mp/src/utils/vrad_launcher/vrad_launcher.vpc
index 08914048..c9868357 100644
--- a/mp/src/utils/vrad_launcher/vrad_launcher.vpc
+++ b/mp/src/utils/vrad_launcher/vrad_launcher.vpc
@@ -8,7 +8,7 @@ $Macro SRCDIR		"..\.."
 $Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 $Macro OUTBINNAME	"vrad"
 
-$Include "$SRCDIR\vpc_scripts\source_exe_con_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc"
 
 $Configuration
 {
diff --git a/mp/src/utils/vtf2tga/vtf2tga.vpc b/mp/src/utils/vtf2tga/vtf2tga.vpc
index dd02ec09..b51ed3e1 100644
--- a/mp/src/utils/vtf2tga/vtf2tga.vpc
+++ b/mp/src/utils/vtf2tga/vtf2tga.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"
 
 $Project "Vtf2tga"
 {
@@ -39,9 +39,9 @@ $Project "Vtf2tga"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\bitmap.lib"
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
-		$DynamicFile	"$SRCDIR\lib\public\vtf.lib"
+		$Lib bitmap
+		$Lib mathlib
+		$Lib tier2
+		$Lib vtf
 	}
 }
diff --git a/mp/src/utils/vtfdiff/vtfdiff.vpc b/mp/src/utils/vtfdiff/vtfdiff.vpc
index f67bd123..7ed8be34 100644
--- a/mp/src/utils/vtfdiff/vtfdiff.vpc
+++ b/mp/src/utils/vtfdiff/vtfdiff.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"
 
 $Project "Vtfdiff"
 {
@@ -18,9 +18,9 @@ $Project "Vtfdiff"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\bitmap.lib"
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
-		$DynamicFile	"$SRCDIR\lib\public\vtf.lib"
+		$Lib bitmap
+		$Lib mathlib
+		$Lib tier2
+		$Lib vtf
 	}
 }
diff --git a/mp/src/utils/vvis/vvis_dll.vpc b/mp/src/utils/vvis/vvis_dll.vpc
index c7d0d457..34ac8fcb 100644
--- a/mp/src/utils/vvis/vvis_dll.vpc
+++ b/mp/src/utils/vvis/vvis_dll.vpc
@@ -7,7 +7,7 @@
 $Macro SRCDIR		"..\.."
 $Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
-$Include "$SRCDIR\vpc_scripts\source_dll_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 
 $Configuration
 {
@@ -94,8 +94,8 @@ $Project "Vvis_dll"
 
 	$Folder	"Link Libraries"
 	{
-		$DynamicFile	"$SRCDIR\lib\public\mathlib.lib"
-		$DynamicFile	"$SRCDIR\lib\public\tier2.lib"
-		$DynamicFile	"$SRCDIR\lib\public\vmpi.lib"
+		$Lib mathlib
+		$Lib tier2
+		$Lib vmpi
 	}
 }
diff --git a/mp/src/utils/vvis_launcher/vvis_launcher.vpc b/mp/src/utils/vvis_launcher/vvis_launcher.vpc
index 88d6e9a1..5cf8eb99 100644
--- a/mp/src/utils/vvis_launcher/vvis_launcher.vpc
+++ b/mp/src/utils/vvis_launcher/vvis_launcher.vpc
@@ -8,7 +8,7 @@ $Macro SRCDIR		"..\.."
 $Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 $Macro OUTBINNAME	"vvis"
 
-$Include "$SRCDIR\vpc_scripts\source_exe_con_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc"
 
 $Configuration
 {
-- 
cgit v1.2.3


From 1524321396a91ef9fa1f19b4873e53e2c5d9e50a Mon Sep 17 00:00:00 2001
From: Joe Ludwig <joe@valvesoftware.com>
Date: Tue, 3 Sep 2013 16:02:10 -0700
Subject: * Fixed Source Mod back-compatability by reordering methods in a
 couple interfaces. * Added missing singleplayer OSX libs * Updated vpc and
 libs.

---
 mp/src/utils/common/mstristrip.cpp    |  2 +-
 mp/src/utils/vbsp/cubemap.cpp         | 11 ++++++-----
 mp/src/utils/vbsp/detailobjects.cpp   |  2 +-
 mp/src/utils/vbsp/ivp.cpp             |  2 +-
 mp/src/utils/vrad/vrad.cpp            |  2 +-
 mp/src/utils/vrad/vrad.h              |  2 +-
 mp/src/utils/vrad/vraddetailprops.cpp |  3 ++-
 7 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'mp/src/utils')

diff --git a/mp/src/utils/common/mstristrip.cpp b/mp/src/utils/common/mstristrip.cpp
index 6a66de2f..9e611f94 100644
--- a/mp/src/utils/common/mstristrip.cpp
+++ b/mp/src/utils/common/mstristrip.cpp
@@ -867,7 +867,7 @@ public:
     int iFirstUsed;
     int iOrigIndex;
 
-    bool operator<(const SortEntry& rhs)
+    bool operator<(const SortEntry& rhs) const
     {
         return iFirstUsed < rhs.iFirstUsed;
     }
diff --git a/mp/src/utils/vbsp/cubemap.cpp b/mp/src/utils/vbsp/cubemap.cpp
index fda41703..2415115b 100644
--- a/mp/src/utils/vbsp/cubemap.cpp
+++ b/mp/src/utils/vbsp/cubemap.cpp
@@ -286,12 +286,8 @@ void CreateDefaultCubemaps( bool bHDR )
 	// NOTE: This implementation depends on the fact that all VTF files contain
 	// all mipmap levels
 	const char *pSkyboxBaseName = FindSkyboxMaterialName();
-	char skyboxMaterialName[MAX_PATH];
-	Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
 
-	IVTFTexture *pSrcVTFTextures[6];
-
-	if( !skyboxMaterialName )
+	if( !pSkyboxBaseName )
 	{
 		if( s_DefaultCubemapNames.Count() )
 		{
@@ -300,6 +296,11 @@ void CreateDefaultCubemaps( bool bHDR )
 		return;
 	}
 
+	char skyboxMaterialName[MAX_PATH];
+	Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
+
+	IVTFTexture *pSrcVTFTextures[6];
+
 	int unionTextureFlags = 0;
 	if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) )
 	{
diff --git a/mp/src/utils/vbsp/detailobjects.cpp b/mp/src/utils/vbsp/detailobjects.cpp
index 22595781..b110534c 100644
--- a/mp/src/utils/vbsp/detailobjects.cpp
+++ b/mp/src/utils/vbsp/detailobjects.cpp
@@ -379,7 +379,7 @@ static int SelectDetail( DetailObjectGroup_t const& group )
 static int AddDetailDictLump( const char* pModelName )
 {
 	DetailObjectDictLump_t dictLump;
-	strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );
+	Q_strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );
 
 	for (int i = s_DetailObjectDictLump.Count(); --i >= 0; )
 	{
diff --git a/mp/src/utils/vbsp/ivp.cpp b/mp/src/utils/vbsp/ivp.cpp
index 421b1b2e..585f0904 100644
--- a/mp/src/utils/vbsp/ivp.cpp
+++ b/mp/src/utils/vbsp/ivp.cpp
@@ -432,7 +432,7 @@ public:
 
 private:
 
-	CPhysConvex *CPlaneList::BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );
+	CPhysConvex *BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );
 
 public:
 	CUtlVector<CPhysConvex *>	m_convex;
diff --git a/mp/src/utils/vrad/vrad.cpp b/mp/src/utils/vrad/vrad.cpp
index 854956ec..8100dc3f 100644
--- a/mp/src/utils/vrad/vrad.cpp
+++ b/mp/src/utils/vrad/vrad.cpp
@@ -93,7 +93,7 @@ bool g_bOnlyStaticProps = false;
 bool g_bShowStaticPropNormals = false;
 
 
-float		gamma = 0.5;
+float		gamma_value = 0.5;
 float		indirect_sun = 1.0;
 float		reflectivityScale = 1.0;
 qboolean	do_extra = true;
diff --git a/mp/src/utils/vrad/vrad.h b/mp/src/utils/vrad/vrad.h
index b9dc0a3f..b39d66c8 100644
--- a/mp/src/utils/vrad/vrad.h
+++ b/mp/src/utils/vrad/vrad.h
@@ -336,7 +336,7 @@ extern dface_t *g_pFaces;
 extern bool g_bMPIProps;
 
 extern	byte	nodehit[MAX_MAP_NODES];
-extern  float	gamma;
+extern  float	gamma_value;
 extern	float	indirect_sun;
 extern	float	smoothing_threshold;
 extern	int		dlight_map;
diff --git a/mp/src/utils/vrad/vraddetailprops.cpp b/mp/src/utils/vrad/vraddetailprops.cpp
index 6712beb1..822bc78c 100644
--- a/mp/src/utils/vrad/vraddetailprops.cpp
+++ b/mp/src/utils/vrad/vraddetailprops.cpp
@@ -524,7 +524,8 @@ private:
 	bool TestPointAgainstSkySurface( Vector const &pt, dface_t *pFace )
 	{
 		// Create sky face winding.
-		winding_t *pWinding = WindingFromFace( pFace, Vector( 0.0f, 0.0f, 0.0f ) );
+		Vector v( 0.0f, 0.0f, 0.0f );
+		winding_t *pWinding = WindingFromFace( pFace, v );
 
 		// Test point in winding. (Since it is at the node, it is in the plane.)
 		bool bRet = PointInWinding( pt, pWinding );
-- 
cgit v1.2.3