Updated the libs. Updated vpc_* to include support for $Conditional in .vgc files. Included vstdlib_exclude.vpc for the OSX builds.

2024-11-21 19:31:14 +00:00 · 2013-07-05 11:28:48 -07:00 · 2013-07-05 11:28:48 -07:00 · cc9c12c5fd
commit cc9c12c5fd
parent 3aacf913d5
61 changed files with 19 additions and 0 deletions
--- a/mp/src/devtools/bin/vpc_linux
+++ b/mp/src/devtools/bin/vpc_linux
--- a/mp/src/devtools/bin/vpc_osx
+++ b/mp/src/devtools/bin/vpc_osx
--- a/mp/src/lib/osx32/bitmap.a
+++ b/mp/src/lib/osx32/bitmap.a
--- a/mp/src/lib/osx32/choreoobjects.a
+++ b/mp/src/lib/osx32/choreoobjects.a
--- a/mp/src/lib/osx32/dmxloader.a
+++ b/mp/src/lib/osx32/dmxloader.a
--- a/mp/src/lib/osx32/libtier0.dylib
+++ b/mp/src/lib/osx32/libtier0.dylib
--- a/mp/src/lib/osx32/libvstdlib.dylib
+++ b/mp/src/lib/osx32/libvstdlib.dylib
--- a/mp/src/lib/osx32/matsys_controls.a
+++ b/mp/src/lib/osx32/matsys_controls.a
--- a/mp/src/lib/osx32/particles.a
+++ b/mp/src/lib/osx32/particles.a
--- a/mp/src/lib/osx32/tier2.a
+++ b/mp/src/lib/osx32/tier2.a
--- a/mp/src/lib/osx32/tier3.a
+++ b/mp/src/lib/osx32/tier3.a
--- a/mp/src/lib/osx32/vtf.a
+++ b/mp/src/lib/osx32/vtf.a
--- a/mp/src/lib/public/appframework.lib
+++ b/mp/src/lib/public/appframework.lib
--- a/mp/src/lib/public/bitmap.lib
+++ b/mp/src/lib/public/bitmap.lib
--- a/mp/src/lib/public/choreoobjects.lib
+++ b/mp/src/lib/public/choreoobjects.lib
--- a/mp/src/lib/public/dmxloader.lib
+++ b/mp/src/lib/public/dmxloader.lib
--- a/mp/src/lib/public/fgdlib.lib
+++ b/mp/src/lib/public/fgdlib.lib
--- a/mp/src/lib/public/linux32/bitmap.a
+++ b/mp/src/lib/public/linux32/bitmap.a
--- a/mp/src/lib/public/linux32/choreoobjects.a
+++ b/mp/src/lib/public/linux32/choreoobjects.a
--- a/mp/src/lib/public/linux32/dmxloader.a
+++ b/mp/src/lib/public/linux32/dmxloader.a
--- a/mp/src/lib/public/linux32/libtier0.so
+++ b/mp/src/lib/public/linux32/libtier0.so
--- a/mp/src/lib/public/linux32/matsys_controls.a
+++ b/mp/src/lib/public/linux32/matsys_controls.a
--- a/mp/src/lib/public/linux32/particles.a
+++ b/mp/src/lib/public/linux32/particles.a
--- a/mp/src/lib/public/linux32/tier2.a
+++ b/mp/src/lib/public/linux32/tier2.a
--- a/mp/src/lib/public/linux32/tier3.a
+++ b/mp/src/lib/public/linux32/tier3.a
--- a/mp/src/lib/public/linux32/vtf.a
+++ b/mp/src/lib/public/linux32/vtf.a
--- a/mp/src/lib/public/mathlib.lib
+++ b/mp/src/lib/public/mathlib.lib
--- a/mp/src/lib/public/matsys_controls.lib
+++ b/mp/src/lib/public/matsys_controls.lib
--- a/mp/src/lib/public/nvtristrip.lib
+++ b/mp/src/lib/public/nvtristrip.lib
--- a/mp/src/lib/public/particles.lib
+++ b/mp/src/lib/public/particles.lib
--- a/mp/src/lib/public/raytrace.lib
+++ b/mp/src/lib/public/raytrace.lib
--- a/mp/src/lib/public/tier0.lib
+++ b/mp/src/lib/public/tier0.lib
--- a/mp/src/lib/public/tier1.lib
+++ b/mp/src/lib/public/tier1.lib
--- a/mp/src/lib/public/tier2.lib
+++ b/mp/src/lib/public/tier2.lib
--- a/mp/src/lib/public/tier3.lib
+++ b/mp/src/lib/public/tier3.lib
--- a/mp/src/lib/public/vgui_controls.lib
+++ b/mp/src/lib/public/vgui_controls.lib
--- a/mp/src/lib/public/vmpi.lib
+++ b/mp/src/lib/public/vmpi.lib
--- a/mp/src/lib/public/vstdlib.lib
+++ b/mp/src/lib/public/vstdlib.lib
--- a/mp/src/lib/public/vtf.lib
+++ b/mp/src/lib/public/vtf.lib
--- a/mp/src/vstdlib/vstdlib_exclude.vpc
+++ b/mp/src/vstdlib/vstdlib_exclude.vpc
@ -0,0 +1,19 @@
+//-----------------------------------------------------------------------------
+//	vstdlib_exclude.vpc
+//
+//	Project Script
+//-----------------------------------------------------------------------------
+
+$MacroRequired "PLATSUBDIR"
+
+$Project
+{
+	$Folder	"Link Libraries"
+	{
+		-$File "$SRCDIR\lib\$PLATFORM\$_IMPLIB_PREFIXvstdlib$_IMPLIB_EXT" [$OSXALL]
+		-$Implib vstdlib [$LINUX]
+		-$File "$SRCDIR\lib\public\$_IMPLIB_PREFIXvstdlib$_IMPLIB_EXT" [$WIN32]
+		-$File "$SRCDIR\lib\public$PLATSUBDIR\$_IMPLIB_PREFIXvstdlib$_IMPLIB_EXT" [$WIN64]
+		-$File "$SRCDIR\lib\public\vstdlib_360.lib"	[$X360]
+	}
+}
--- a/sp/src/devtools/bin/vpc_linux
+++ b/sp/src/devtools/bin/vpc_linux
--- a/sp/src/devtools/bin/vpc_osx
+++ b/sp/src/devtools/bin/vpc_osx
--- a/sp/src/lib/osx32/bitmap.a
+++ b/sp/src/lib/osx32/bitmap.a
--- a/sp/src/lib/osx32/choreoobjects.a
+++ b/sp/src/lib/osx32/choreoobjects.a
--- a/sp/src/lib/osx32/dmxloader.a
+++ b/sp/src/lib/osx32/dmxloader.a
--- a/sp/src/lib/osx32/libtier0.dylib
+++ b/sp/src/lib/osx32/libtier0.dylib
--- a/sp/src/lib/osx32/libvstdlib.dylib
+++ b/sp/src/lib/osx32/libvstdlib.dylib
--- a/sp/src/lib/osx32/matsys_controls.a
+++ b/sp/src/lib/osx32/matsys_controls.a
--- a/sp/src/lib/osx32/particles.a
+++ b/sp/src/lib/osx32/particles.a
--- a/sp/src/lib/osx32/tier2.a
+++ b/sp/src/lib/osx32/tier2.a
--- a/sp/src/lib/osx32/tier3.a
+++ b/sp/src/lib/osx32/tier3.a
--- a/sp/src/lib/osx32/vtf.a
+++ b/sp/src/lib/osx32/vtf.a
--- a/sp/src/lib/public/linux32/bitmap.a
+++ b/sp/src/lib/public/linux32/bitmap.a
--- a/sp/src/lib/public/linux32/choreoobjects.a
+++ b/sp/src/lib/public/linux32/choreoobjects.a
--- a/sp/src/lib/public/linux32/dmxloader.a
+++ b/sp/src/lib/public/linux32/dmxloader.a
--- a/sp/src/lib/public/linux32/libtier0.so
+++ b/sp/src/lib/public/linux32/libtier0.so
--- a/sp/src/lib/public/linux32/matsys_controls.a
+++ b/sp/src/lib/public/linux32/matsys_controls.a
--- a/sp/src/lib/public/linux32/particles.a
+++ b/sp/src/lib/public/linux32/particles.a
--- a/sp/src/lib/public/linux32/tier2.a
+++ b/sp/src/lib/public/linux32/tier2.a
--- a/sp/src/lib/public/linux32/tier3.a
+++ b/sp/src/lib/public/linux32/tier3.a
--- a/sp/src/lib/public/linux32/vtf.a
+++ b/sp/src/lib/public/linux32/vtf.a