test

Conflicts: mp/src/thirdparty/luabind/luabind.vpc
2013-10-30 03:33:48 +00:00 · 2013-10-30 03:33:48 +00:00 · 6be4165a85
parent 03b770e3de
commit 6be4165a85
6 changed files with 52 additions and 47 deletions
--- a/mp/src/game/server/server_ff.vpc
+++ b/mp/src/game/server/server_ff.vpc
@ -45,12 +45,6 @@ $Project "Server (FF)"
 				$File	"ff\ff_sv_player.cpp"
 				$File	"ff\ff_sv_player.h"
 			}
-
-			$Folder "Libraries"
-			{
-				$Lib 	lua
-				$Lib	luabind
-			}
 		}

 	
--- a/mp/src/game/shared/ff/ff_shared.vpc
+++ b/mp/src/game/shared/ff/ff_shared.vpc
@ -37,4 +37,10 @@ $Project
 			-$File	"$SRCDIR\game\shared\hl2mp\hl2mp_gamerules.h"
 		}
 	}
+
+	$Folder "Link Libraries"
+	{
+		$Lib "lua"
+		$Lib "luabind"
+	}
 }
--- a/mp/src/lib/public/linux32/mathlib.a
+++ b/mp/src/lib/public/linux32/mathlib.a
--- a/mp/src/lib/public/linux32/tier1.a
+++ b/mp/src/lib/public/linux32/tier1.a
--- a/mp/src/lib/public/linux32/vgui_controls.a
+++ b/mp/src/lib/public/linux32/vgui_controls.a
--- a/mp/src/thirdparty/luabind/luabind.vpc
+++ b/mp/src/thirdparty/luabind/luabind.vpc
@ -37,4 +37,9 @@ $Project "luabind"
 		$File	"weak_ref.cpp"
 		$File	"wrapper_base.cpp"
 	}
+
+	$Folder "Link Libraries"
+	{
+		$Lib "lua"
+	}
 }