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
squeek
parent
c28f1e019b
commit
24aa17d15e
|
|
@ -1 +0,0 @@
|
|||
devtools\bin\vpc.exe +lualibs /mksln ff_lualibs.sln
|
||||
|
|
@ -1,71 +1,75 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// GROUPS.VGC
|
||||
//
|
||||
// Group Configurations for all Source(TM) Projects
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
///////////////////////
|
||||
// Group definitions //
|
||||
///////////////////////
|
||||
|
||||
$Group "gamedlls"
|
||||
{
|
||||
"client"
|
||||
"server"
|
||||
}
|
||||
|
||||
$Group "game"
|
||||
{
|
||||
"client"
|
||||
"mathlib"
|
||||
"raytrace"
|
||||
"server"
|
||||
"tier1"
|
||||
"vgui_controls"
|
||||
}
|
||||
|
||||
$Group "shaders"
|
||||
{
|
||||
"game_shader_dx9"
|
||||
}
|
||||
|
||||
$Group "everything"
|
||||
{
|
||||
"captioncompiler"
|
||||
"client"
|
||||
"fgdlib"
|
||||
"game_shader_dx9"
|
||||
"glview"
|
||||
"height2normal"
|
||||
"mathlib"
|
||||
"motionmapper"
|
||||
"phonemeextractor"
|
||||
"raytrace"
|
||||
"qc_eyes"
|
||||
"server"
|
||||
"serverplugin_empty"
|
||||
"tgadiff"
|
||||
"tier1"
|
||||
"vbsp"
|
||||
"vgui_controls"
|
||||
"vice"
|
||||
"vrad_dll"
|
||||
"vrad_launcher"
|
||||
"vtf2tga"
|
||||
"vtfdiff"
|
||||
"vvis_dll"
|
||||
"vvis_launcher"
|
||||
}
|
||||
|
||||
$Group "dedicated"
|
||||
{
|
||||
"mathlib"
|
||||
"server"
|
||||
"tier1"
|
||||
}
|
||||
|
||||
$Group "lualibs"
|
||||
{
|
||||
"lua"
|
||||
"luabind"
|
||||
//-----------------------------------------------------------------------------
|
||||
// GROUPS.VGC
|
||||
//
|
||||
// Group Configurations for all Source(TM) Projects
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
///////////////////////
|
||||
// Group definitions //
|
||||
///////////////////////
|
||||
|
||||
$Group "gamedlls"
|
||||
{
|
||||
"client"
|
||||
"server"
|
||||
}
|
||||
|
||||
$Group "game"
|
||||
{
|
||||
"client"
|
||||
"mathlib"
|
||||
"raytrace"
|
||||
"server"
|
||||
"tier1"
|
||||
"vgui_controls"
|
||||
"lua"
|
||||
"luabind"
|
||||
}
|
||||
|
||||
$Group "shaders"
|
||||
{
|
||||
"game_shader_dx9"
|
||||
}
|
||||
|
||||
$Group "everything"
|
||||
{
|
||||
"captioncompiler"
|
||||
"client"
|
||||
"fgdlib"
|
||||
"game_shader_dx9"
|
||||
"glview"
|
||||
"height2normal"
|
||||
"mathlib"
|
||||
"motionmapper"
|
||||
"phonemeextractor"
|
||||
"raytrace"
|
||||
"qc_eyes"
|
||||
"server"
|
||||
"serverplugin_empty"
|
||||
"tgadiff"
|
||||
"tier1"
|
||||
"vbsp"
|
||||
"vgui_controls"
|
||||
"vice"
|
||||
"vrad_dll"
|
||||
"vrad_launcher"
|
||||
"vtf2tga"
|
||||
"vtfdiff"
|
||||
"vvis_dll"
|
||||
"vvis_launcher"
|
||||
"lua"
|
||||
"luabind"
|
||||
}
|
||||
|
||||
$Group "dedicated"
|
||||
{
|
||||
"mathlib"
|
||||
"server"
|
||||
"tier1"
|
||||
}
|
||||
|
||||
$Group "lualibs"
|
||||
{
|
||||
"lua"
|
||||
"luabind"
|
||||
}
|
||||
|
|
@ -1,138 +1,131 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// PROJECTS.VGC
|
||||
//
|
||||
// Project Configurations for all Source(TM) Projects
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
/////////////////////////
|
||||
// Project definitions //
|
||||
/////////////////////////
|
||||
|
||||
$Project "captioncompiler"
|
||||
{
|
||||
"utils\captioncompiler\captioncompiler.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
|
||||
$Project "client"
|
||||
{
|
||||
"game\client\client_ff.vpc" [($WIN32||$POSIX) && $FF]
|
||||
}
|
||||
|
||||
$Project "game_shader_dx9"
|
||||
{
|
||||
"materialsystem\stdshaders\game_shader_dx9_ff.vpc" [$FF]
|
||||
}
|
||||
|
||||
$Project "glview"
|
||||
{
|
||||
"utils\glview\glview.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "height2normal"
|
||||
{
|
||||
"utils\height2normal\height2normal.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "server"
|
||||
{
|
||||
"game\server\server_ff.vpc" [($WIN32||$POSIX) && $FF]
|
||||
}
|
||||
|
||||
$Project "mathlib"
|
||||
{
|
||||
"mathlib\mathlib.vpc" [$WINDOWS||$X360||$POSIX]
|
||||
}
|
||||
|
||||
$Project "motionmapper"
|
||||
{
|
||||
"utils\motionmapper\motionmapper.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "phonemeextractor"
|
||||
{
|
||||
"utils\phonemeextractor\phonemeextractor.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "qc_eyes"
|
||||
{
|
||||
"utils\qc_eyes\qc_eyes.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "serverplugin_empty"
|
||||
{
|
||||
"utils\serverplugin_sample\serverplugin_empty.vpc" [$WIN32||$POSIX]
|
||||
}
|
||||
|
||||
$Project "tgadiff"
|
||||
{
|
||||
"utils\tgadiff\tgadiff.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "tier1"
|
||||
{
|
||||
"tier1\tier1.vpc" [$WINDOWS || $X360||$POSIX]
|
||||
}
|
||||
|
||||
$Project "vbsp"
|
||||
{
|
||||
"utils\vbsp\vbsp.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vgui_controls"
|
||||
{
|
||||
"vgui2\vgui_controls\vgui_controls.vpc" [$WIN32||$X360||$POSIX]
|
||||
}
|
||||
|
||||
$Project "vice"
|
||||
{
|
||||
"utils\vice\vice.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vrad_dll"
|
||||
{
|
||||
"utils\vrad\vrad_dll.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vrad_launcher"
|
||||
{
|
||||
"utils\vrad_launcher\vrad_launcher.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vtf2tga"
|
||||
{
|
||||
"utils\vtf2tga\vtf2tga.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vtfdiff"
|
||||
{
|
||||
"utils\vtfdiff\vtfdiff.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vvis_dll"
|
||||
{
|
||||
"utils\vvis\vvis_dll.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vvis_launcher"
|
||||
{
|
||||
"utils\vvis_launcher\vvis_launcher.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
// ff external libs
|
||||
$Project "lua"
|
||||
{
|
||||
"thirdparty\lua\lua.vpc" [$WIN32||$X360||$POSIX]
|
||||
}
|
||||
|
||||
$Project "luabind"
|
||||
{
|
||||
"thirdparty\luabind\luabind.vpc" [$WIN32||$X360||$POSIX]
|
||||
}
|
||||
|
||||
$Project "luatest"
|
||||
{
|
||||
"thirdparty\luatest\luatest.vpc" [$WIN32||$X360||$POSIX]
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// PROJECTS.VGC
|
||||
//
|
||||
// Project Configurations for all Source(TM) Projects
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
/////////////////////////
|
||||
// Project definitions //
|
||||
/////////////////////////
|
||||
|
||||
$Project "captioncompiler"
|
||||
{
|
||||
"utils\captioncompiler\captioncompiler.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
|
||||
$Project "client"
|
||||
{
|
||||
"game\client\client_ff.vpc" [($WIN32||$POSIX) && $FF]
|
||||
}
|
||||
|
||||
$Project "game_shader_dx9"
|
||||
{
|
||||
"materialsystem\stdshaders\game_shader_dx9_ff.vpc" [$FF]
|
||||
}
|
||||
|
||||
$Project "glview"
|
||||
{
|
||||
"utils\glview\glview.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "height2normal"
|
||||
{
|
||||
"utils\height2normal\height2normal.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "server"
|
||||
{
|
||||
"game\server\server_ff.vpc" [($WIN32||$POSIX) && $FF]
|
||||
}
|
||||
|
||||
$Project "mathlib"
|
||||
{
|
||||
"mathlib\mathlib.vpc" [$WINDOWS||$X360||$POSIX]
|
||||
}
|
||||
|
||||
$Project "motionmapper"
|
||||
{
|
||||
"utils\motionmapper\motionmapper.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "phonemeextractor"
|
||||
{
|
||||
"utils\phonemeextractor\phonemeextractor.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "qc_eyes"
|
||||
{
|
||||
"utils\qc_eyes\qc_eyes.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "serverplugin_empty"
|
||||
{
|
||||
"utils\serverplugin_sample\serverplugin_empty.vpc" [$WIN32||$POSIX]
|
||||
}
|
||||
|
||||
$Project "tgadiff"
|
||||
{
|
||||
"utils\tgadiff\tgadiff.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "tier1"
|
||||
{
|
||||
"tier1\tier1.vpc" [$WINDOWS || $X360||$POSIX]
|
||||
}
|
||||
|
||||
$Project "vbsp"
|
||||
{
|
||||
"utils\vbsp\vbsp.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vgui_controls"
|
||||
{
|
||||
"vgui2\vgui_controls\vgui_controls.vpc" [$WIN32||$X360||$POSIX]
|
||||
}
|
||||
|
||||
$Project "vice"
|
||||
{
|
||||
"utils\vice\vice.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vrad_dll"
|
||||
{
|
||||
"utils\vrad\vrad_dll.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vrad_launcher"
|
||||
{
|
||||
"utils\vrad_launcher\vrad_launcher.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vtf2tga"
|
||||
{
|
||||
"utils\vtf2tga\vtf2tga.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vtfdiff"
|
||||
{
|
||||
"utils\vtfdiff\vtfdiff.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vvis_dll"
|
||||
{
|
||||
"utils\vvis\vvis_dll.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
$Project "vvis_launcher"
|
||||
{
|
||||
"utils\vvis_launcher\vvis_launcher.vpc" [$WIN32]
|
||||
}
|
||||
|
||||
// ff external libs
|
||||
$Project "lua"
|
||||
{
|
||||
"thirdparty\lua\lua.vpc" [$WIN32||$X360||$POSIX]
|
||||
}
|
||||
|
||||
$Project "luabind"
|
||||
{
|
||||
"thirdparty\luabind\luabind.vpc" [$WIN32||$X360||$POSIX]
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue