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.
---
 sp/src/vpc_scripts/source_video_base.vpc | 46 +++++++++-----------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

(limited to 'sp/src/vpc_scripts/source_video_base.vpc')

diff --git a/sp/src/vpc_scripts/source_video_base.vpc b/sp/src/vpc_scripts/source_video_base.vpc
index dd7f3653..4ccafb63 100644
--- a/sp/src/vpc_scripts/source_video_base.vpc
+++ b/sp/src/vpc_scripts/source_video_base.vpc
@@ -16,18 +16,15 @@
 //-----------------------------------------------------------------------------
 
 
-// We use Quicktime exclusively (and usually only quicktime) on the Mac
+// We use Quicktime exclusively (and only quicktime) on the Mac
 //
 // We have two configurations for Win32. 
-//
-// if the QUICKTIME_WIN32 Macro is enabled, QuickTime operation is enabled, along with Bink, AVI, and WMV video 
-// if the QUICKTIME_WIN32 Macro is not enabled, we only build for Bink, AVI and WMV
-//
-// On the Mac OSX we enable Quicktime only, and set the FORCE_QUICKTIME define, which causes requests to play
-//    other media file types to look for a quicktime compatible version of the media file first
-//
+// 
+// 1) Comment out the following $macro line out to enable BINK (and AVI and WMV) playback of videos
+// 2) Uncomment the following $macro line out to enable Quicktime (and AVI and WMV) playback of videos and
+//     - the Quicktime file override ( the Quicktime .mov is played if present even if a .bnk, .avi or .wmv file was specified )
 
-//$Macro QUICKTIME_WIN32	1		[$WIN32 && !$X360]
+// $macro QUICKTIME_WIN32 1
 
 $Macro GL "1" [!$DEDICATED && !$WIN32 && !$WIN64]
 // If we're using OpenGL, we're implicitly using SDL.
@@ -37,34 +34,17 @@ $Configuration
 {
 	$Compiler
 	{
-		// OSX Builds
-		$PreprocessorDefinitions		"$BASE;QUICKTIME_VIDEO;FORCE_QUICKTIME"				[$OSXALL]				
+		$PreprocessorDefinitions		"$BASE;QUICKTIME_VIDEO;FORCE_QUICKTIME"		[$OSXALL]				
 
 		// Windows PC, without Quicktime, and with Quicktime
-		$PreprocessorDefinitions		"$BASE;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO"				[$WIN32 && !$X360 && !$QUICKTIME_WIN32]
-		$PreprocessorDefinitions		"$BASE;AVI_VIDEO;WMV_VIDEO;QUICKTIME_VIDEO"			[$WIN32 && !$X360 &&  $QUICKTIME_WIN32]
-		
-		// Xbox 360 builds
-		$PreprocessorDefinitions		"$BASE;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO"				[$X360]
 
-		// Linux 
+		$PreprocessorDefinitions		"$BASE;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO"							[$WIN32&&!$QUICKTIME_WIN32]
+		$PreprocessorDefinitions		"$BASE;AVI_VIDEO;WMV_VIDEO;QUICKTIME_VIDEO"		[$WIN32&&$QUICKTIME_WIN32]
+		$PreprocessorDefinitions		"$BASE;BINK_VIDEO"							[$X360]
 		$PreprocessorDefinitions		"$BASE;BINK_VIDEO"							[$LINUXALL]
-
-		// OpenGL
-		$PreprocessorDefinitions		"$BASE;GL_GLEXT_PROTOTYPES;DX_TO_GL_ABSTRACTION"		[$GL]
-
-                // SDL
-		$PreprocessorDefinitions		"$BASE;USE_SDL"							[$SDL]
+		
+		$PreprocessorDefinitions		"$BASE;GL_GLEXT_PROTOTYPES;DX_TO_GL_ABSTRACTION"			[$GL]
+		$PreprocessorDefinitions		"$BASE;USE_SDL"										[$SDL]
                 $AdditionalIncludeDirectories		"$BASE;$SRCDIR\thirdparty\SDL2"					[$SDL || $DEDICATED]
 	}
-
 }
-
-$Project
-{
-	$Folder "Link Libraries" [$OSXALL && $SDL]
-	{
-		$DynamicFile   "$SRCDIR\lib\public\$PLATFORM\$_IMPLIB_PREFIXSDL2$_IMPLIB_EXT"
-	}
-}
-
-- 
cgit v1.2.3