diff options
| author | Joe Ludwig <[email protected]> | 2013-09-02 11:39:10 -0700 |
|---|---|---|
| committer | Joe Ludwig <[email protected]> | 2013-09-02 11:39:10 -0700 |
| commit | a0c29e7dd67abb15c74c85f07741784877edfdcd (patch) | |
| tree | 35bd6b4580afa14648895b0f321d33a712a5d0fa /mp/src/utils | |
| parent | Added bloom shader and screenspace effect helpers as examples for the SDK. (diff) | |
| download | source-sdk-2013-a0c29e7dd67abb15c74c85f07741784877edfdcd.tar.xz source-sdk-2013-a0c29e7dd67abb15c74c85f07741784877edfdcd.zip | |
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.
Diffstat (limited to 'mp/src/utils')
| -rw-r--r-- | mp/src/utils/captioncompiler/captioncompiler.vpc | 10 | ||||
| -rw-r--r-- | mp/src/utils/glview/glview.vpc | 6 | ||||
| -rw-r--r-- | mp/src/utils/height2normal/height2normal.vpc | 8 | ||||
| -rw-r--r-- | mp/src/utils/motionmapper/motionmapper.vpc | 8 | ||||
| -rw-r--r-- | mp/src/utils/phonemeextractor/phonemeextractor.vpc | 4 | ||||
| -rw-r--r-- | mp/src/utils/phonemeextractor/phonemeextractor_ims.vpc | 4 | ||||
| -rw-r--r-- | mp/src/utils/qc_eyes/qc_eyes.vpc | 2 | ||||
| -rw-r--r-- | mp/src/utils/serverplugin_sample/serverplugin_empty.vpc | 8 | ||||
| -rw-r--r-- | mp/src/utils/tgadiff/tgadiff.vpc | 8 | ||||
| -rw-r--r-- | mp/src/utils/vbsp/vbsp.vpc | 12 | ||||
| -rw-r--r-- | mp/src/utils/vice/vice.vpc | 6 | ||||
| -rw-r--r-- | mp/src/utils/vrad/vrad_dll.vpc | 14 | ||||
| -rw-r--r-- | mp/src/utils/vrad_launcher/vrad_launcher.vpc | 2 | ||||
| -rw-r--r-- | mp/src/utils/vtf2tga/vtf2tga.vpc | 10 | ||||
| -rw-r--r-- | mp/src/utils/vtfdiff/vtfdiff.vpc | 10 | ||||
| -rw-r--r-- | mp/src/utils/vvis/vvis_dll.vpc | 8 | ||||
| -rw-r--r-- | mp/src/utils/vvis_launcher/vvis_launcher.vpc | 2 |
17 files changed, 59 insertions, 63 deletions
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
{
|