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/vbsp/vbsp.vpc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mp/src/utils/vbsp')

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"
-- 
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/vbsp/cubemap.cpp       | 11 ++++++-----
 mp/src/utils/vbsp/detailobjects.cpp |  2 +-
 mp/src/utils/vbsp/ivp.cpp           |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'mp/src/utils/vbsp')

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;
-- 
cgit v1.2.3