fortressforever
/
fortressforever-2013
mirror of https://github.com/fortressforever/fortressforever-2013.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move lua + luabind into 'game' so you dont have to go generate a second set of projects, and they are built when game is (no external deps go missing) 

Conflicts:
	mp/src/vpc_scripts/groups_ff.vgc
	mp/src/vpc_scripts/projects_ff.vgc
This commit is contained in:
Dexter 2013-10-27 02:12:58 +00:00 committed by squeek
parent c28f1e019b
commit 24aa17d15e
3 changed files with 205 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mp/src/create_ff_lualibs.bat
View File

@ -1 +0,0 @@
devtools\bin\vpc.exe +lualibs /mksln ff_lualibs.sln

144
mp/src/vpc_scripts/groups_ff.vgc
View File

@ -1,71 +1,75 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// GROUPS.VGC // GROUPS.VGC
// //
// Group Configurations for all Source(TM) Projects // Group Configurations for all Source(TM) Projects
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/////////////////////// ///////////////////////
// Group definitions // // Group definitions //
/////////////////////// ///////////////////////
$Group "gamedlls" $Group "gamedlls"
{ {
"client" "client"
"server" "server"
} }
$Group "game" $Group "game"
{ {
"client" "client"
"mathlib" "mathlib"
"raytrace" "raytrace"
"server" "server"
"tier1" "tier1"
"vgui_controls" "vgui_controls"
} "lua"
"luabind"
$Group "shaders" }
{
"game_shader_dx9" $Group "shaders"
} {
"game_shader_dx9"
$Group "everything" }
{
"captioncompiler" $Group "everything"
"client" {
"fgdlib" "captioncompiler"
"game_shader_dx9" "client"
"glview" "fgdlib"
"height2normal" "game_shader_dx9"
"mathlib" "glview"
"motionmapper" "height2normal"
"phonemeextractor" "mathlib"
"raytrace" "motionmapper"
"qc_eyes" "phonemeextractor"
"server" "raytrace"
"serverplugin_empty" "qc_eyes"
"tgadiff" "server"
"tier1" "serverplugin_empty"
"vbsp" "tgadiff"
"vgui_controls" "tier1"
"vice" "vbsp"
"vrad_dll" "vgui_controls"
"vrad_launcher" "vice"
"vtf2tga" "vrad_dll"
"vtfdiff" "vrad_launcher"
"vvis_dll" "vtf2tga"
"vvis_launcher" "vtfdiff"
} "vvis_dll"
"vvis_launcher"
$Group "dedicated" "lua"
{ "luabind"
"mathlib" }
"server"
"tier1" $Group "dedicated"
} {
"mathlib"
$Group "lualibs" "server"
{ "tier1"
"lua" }
"luabind"
$Group "lualibs"
{
"lua"
"luabind"
} }

269
mp/src/vpc_scripts/projects_ff.vgc
View File

@ -1,138 +1,131 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// PROJECTS.VGC // PROJECTS.VGC
// //
// Project Configurations for all Source(TM) Projects // Project Configurations for all Source(TM) Projects
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
///////////////////////// /////////////////////////
// Project definitions // // Project definitions //
///////////////////////// /////////////////////////
$Project "captioncompiler" $Project "captioncompiler"
{ {
"utils\captioncompiler\captioncompiler.vpc" [$WIN32] "utils\captioncompiler\captioncompiler.vpc" [$WIN32]
} }
$Project "client" $Project "client"
{ {
"game\client\client_ff.vpc" [($WIN32||$POSIX) && $FF] "game\client\client_ff.vpc" [($WIN32||$POSIX) && $FF]
} }
$Project "game_shader_dx9" $Project "game_shader_dx9"
{ {
"materialsystem\stdshaders\game_shader_dx9_ff.vpc" [$FF] "materialsystem\stdshaders\game_shader_dx9_ff.vpc" [$FF]
} }
$Project "glview" $Project "glview"
{ {
"utils\glview\glview.vpc" [$WIN32] "utils\glview\glview.vpc" [$WIN32]
} }
$Project "height2normal" $Project "height2normal"
{ {
"utils\height2normal\height2normal.vpc" [$WIN32] "utils\height2normal\height2normal.vpc" [$WIN32]
} }
$Project "server" $Project "server"
{ {
"game\server\server_ff.vpc" [($WIN32||$POSIX) && $FF] "game\server\server_ff.vpc" [($WIN32||$POSIX) && $FF]
} }
$Project "mathlib" $Project "mathlib"
{ {
"mathlib\mathlib.vpc" [$WINDOWS||$X360||$POSIX] "mathlib\mathlib.vpc" [$WINDOWS||$X360||$POSIX]
} }
$Project "motionmapper" $Project "motionmapper"
{ {
"utils\motionmapper\motionmapper.vpc" [$WIN32] "utils\motionmapper\motionmapper.vpc" [$WIN32]
} }
$Project "phonemeextractor" $Project "phonemeextractor"
{ {
"utils\phonemeextractor\phonemeextractor.vpc" [$WIN32] "utils\phonemeextractor\phonemeextractor.vpc" [$WIN32]
} }
$Project "qc_eyes" $Project "qc_eyes"
{ {
"utils\qc_eyes\qc_eyes.vpc" [$WIN32] "utils\qc_eyes\qc_eyes.vpc" [$WIN32]
} }
$Project "serverplugin_empty" $Project "serverplugin_empty"
{ {
"utils\serverplugin_sample\serverplugin_empty.vpc" [$WIN32||$POSIX] "utils\serverplugin_sample\serverplugin_empty.vpc" [$WIN32||$POSIX]
} }
$Project "tgadiff" $Project "tgadiff"
{ {
"utils\tgadiff\tgadiff.vpc" [$WIN32] "utils\tgadiff\tgadiff.vpc" [$WIN32]
} }
$Project "tier1" $Project "tier1"
{ {
"tier1\tier1.vpc" [$WINDOWS || $X360||$POSIX] "tier1\tier1.vpc" [$WINDOWS || $X360||$POSIX]
} }
$Project "vbsp" $Project "vbsp"
{ {
"utils\vbsp\vbsp.vpc" [$WIN32] "utils\vbsp\vbsp.vpc" [$WIN32]
} }
$Project "vgui_controls" $Project "vgui_controls"
{ {
"vgui2\vgui_controls\vgui_controls.vpc" [$WIN32||$X360||$POSIX] "vgui2\vgui_controls\vgui_controls.vpc" [$WIN32||$X360||$POSIX]
} }
$Project "vice" $Project "vice"
{ {
"utils\vice\vice.vpc" [$WIN32] "utils\vice\vice.vpc" [$WIN32]
} }
$Project "vrad_dll" $Project "vrad_dll"
{ {
"utils\vrad\vrad_dll.vpc" [$WIN32] "utils\vrad\vrad_dll.vpc" [$WIN32]
} }
$Project "vrad_launcher" $Project "vrad_launcher"
{ {
"utils\vrad_launcher\vrad_launcher.vpc" [$WIN32] "utils\vrad_launcher\vrad_launcher.vpc" [$WIN32]
} }
$Project "vtf2tga" $Project "vtf2tga"
{ {
"utils\vtf2tga\vtf2tga.vpc" [$WIN32] "utils\vtf2tga\vtf2tga.vpc" [$WIN32]
} }
$Project "vtfdiff" $Project "vtfdiff"
{ {
"utils\vtfdiff\vtfdiff.vpc" [$WIN32] "utils\vtfdiff\vtfdiff.vpc" [$WIN32]
} }
$Project "vvis_dll" $Project "vvis_dll"
{ {
"utils\vvis\vvis_dll.vpc" [$WIN32] "utils\vvis\vvis_dll.vpc" [$WIN32]
} }
$Project "vvis_launcher" $Project "vvis_launcher"
{ {
"utils\vvis_launcher\vvis_launcher.vpc" [$WIN32] "utils\vvis_launcher\vvis_launcher.vpc" [$WIN32]
} }
// ff external libs // ff external libs
$Project "lua" $Project "lua"
{ {
"thirdparty\lua\lua.vpc" [$WIN32||$X360||$POSIX] "thirdparty\lua\lua.vpc" [$WIN32||$X360||$POSIX]
} }
$Project "luabind" $Project "luabind"
{ {
"thirdparty\luabind\luabind.vpc" [$WIN32||$X360||$POSIX] "thirdparty\luabind\luabind.vpc" [$WIN32||$X360||$POSIX]
} }
$Project "luatest"
{
"thirdparty\luatest\luatest.vpc" [$WIN32||$X360||$POSIX]
}