From a0c29e7dd67abb15c74c85f07741784877edfdcd Mon Sep 17 00:00:00 2001 From: Joe Ludwig 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/game/server/server_base.vpc | 42 +++++++------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) (limited to 'mp/src/game/server/server_base.vpc') diff --git a/mp/src/game/server/server_base.vpc b/mp/src/game/server/server_base.vpc index 8b24610b..94dfd0f9 100644 --- a/mp/src/game/server/server_base.vpc +++ b/mp/src/game/server/server_base.vpc @@ -44,6 +44,11 @@ $Configuration "Release" $Configuration { + $General + { + $OutputDirectory ".\$GAMENAME" [$OSXALL] + } + $Compiler { $AdditionalIncludeDirectories "$BASE;.\;$SRCDIR\game\shared;$SRCDIR\utils\common;$SRCDIR\game\shared\econ;$SRCDIR\game\server\NextBot" @@ -998,40 +1003,7 @@ $Project $File "toolframework_server.h" } - - $Folder "Link Libraries" [$WIN32] - { - $DynamicFile "$SRCDIR\lib\public\choreoobjects.lib" - $DynamicFile "$SRCDIR\lib\public\dmxloader.lib" - $DynamicFile "$SRCDIR\lib\public\mathlib.lib" - $DynamicFile "$SRCDIR\lib\public\particles.lib" - $DynamicFile "$SRCDIR\lib\public\tier2.lib" - $DynamicFile "$SRCDIR\lib\public\tier3.lib" - $DynamicFile "$SRCDIR\lib\public\steam_api.lib" - } - - $Folder "Link Libraries" [$X360] - { - $DynamicFile "$SRCDIR\lib\public\choreoobjects_360.lib" - $DynamicFile "$SRCDIR\lib\public\dmxloader_360.lib" - $DynamicFile "$SRCDIR\lib\public\mathlib_360.lib" - $DynamicFile "$SRCDIR\lib\public\particles_360.lib" - $DynamicFile "$SRCDIR\lib\public\tier2_360.lib" - $DynamicFile "$SRCDIR\lib\public\tier3_360.lib" - } - - $Folder "Link Libraries" [$POSIX && !$LINUX] - { - $DynamicFile "$SRCDIR\lib\$PLATFORM\choreoobjects$_STATICLIB_EXT" - $DynamicFile "$SRCDIR\lib\$PLATFORM\dmxloader$_STATICLIB_EXT" - $DynamicFile "$SRCDIR\lib\$PLATFORM\mathlib$_STATICLIB_EXT" - $DynamicFile "$SRCDIR\lib\$PLATFORM\particles$_STATICLIB_EXT" - $DynamicFile "$SRCDIR\lib\$PLATFORM\tier2$_STATICLIB_EXT" - $DynamicFile "$SRCDIR\lib\$PLATFORM\tier3$_STATICLIB_EXT" - $DynamicFile "$SRCDIR\lib\$PLATFORM\$_IMPLIB_PREFIXsteam_api$_IMPLIB_EXT" - } - - $Folder "Link Libraries" [$LINUX] + $Folder "Link Libraries" { $Lib choreoobjects $Lib dmxloader @@ -1039,6 +1011,6 @@ $Project $Lib particles $Lib tier2 $Lib tier3 - $DynamicFile "$SRCDIR\lib\$PLATFORM\$_IMPLIB_PREFIXsteam_api$_EXTERNAL_IMPLIB_EXT" + $ImpLibexternal steam_api } } -- cgit v1.2.3