tweaked lua VPC to match it's actual lib makefile, a few tweaks. still not working on linux tho

Conflicts:
	mp/src/thirdparty/lua/lua.vpc
This commit is contained in:
Dexter 2013-11-02 08:58:14 +00:00 committed by squeek
parent 54b5307c72
commit c6be12a4e0
3 changed files with 85 additions and 91 deletions

View file

@ -39,12 +39,6 @@ $Project "Client (FF)"
$File "ff\ff_cl_player.cpp"
$File "ff\ff_cl_player.h"
}
$Folder "Libraries"
{
$Lib lua
$Lib luabind
}
}
// IMPORTANT: remove conflicting hl2dm SDK stuff as we implement our own!!

View file

@ -1,84 +1,82 @@
// lua project script
$Macro SRCDIR "..\.."
$Include "$SRCDIR\vpc_scripts\source_lib_base.vpc" // this for static lib
$Configuration
{
$Compiler
{
$AdditionalIncludeDirectories "$BASE"
$EnableC++Exceptions "Yes (/EHsc)"
$PreprocessorDefinitions "LUA_OPNAMES"
// Compile as C++ code breaks symbols, didnt want to spend any more time figuring out why becuase this is essentially what
// we have been doing
$CompileAs "Compile as C Code (/TC)"
}
}
$Project "lua"
{
$Folder "Source Files"
{
$File "lapi.c"
$File "lauxlib.c"
$File "lbaselib.c"
$File "lcode.c"
$File "ldblib.c"
$File "ldebug.c"
$File "ldo.c"
$File "ldump.c"
$File "lfunc.c"
$File "lgc.c"
$File "linit.c"
$File "liolib.c"
$File "llex.c"
$File "lmathlib.c"
$File "lmem.c"
$File "loadlib.c"
$File "lobject.c"
$File "lopcodes.c"
$File "loslib.c"
$File "lparser.c"
$File "lstate.c"
$File "lstring.c"
$File "lstrlib.c"
$File "ltable.c"
$File "ltablib.c"
$File "ltm.c"
//$File "lua.c"
$File "luac.c"
$File "lundump.c"
$File "lvm.c"
$File "lzio.c"
$File "print.c"
}
$Folder "Header Files"
{
$File "lapi.h"
$File "lauxlib.h"
$File "lcode.h"
$File "ldebug.h"
$File "ldo.h"
$File "lfunc.h"
$File "lgc.h"
$File "llex.h"
$File "llimits.h" // ask me how many times i typo'd this
$File "lmem.h"
$File "lobject.h"
$File "lopcodes.h"
$File "lparser.h"
$File "lstate.h"
$File "lstring.h"
$File "ltable.h"
$File "ltm.h"
$File "lua.hpp"
$File "luaconf.h"
$File "lualib.h"
$File "lundump.h"
$File "lvm.h"
$File "lzio.h"
}
}
// lua project script
$Macro SRCDIR "..\.."
$Include "$SRCDIR\vpc_scripts\source_lib_base.vpc" // this for static lib
$Configuration
{
$Compiler
{
$AdditionalIncludeDirectories "$BASE"
$EnableC++Exceptions "Yes (/EHsc)"
$PreprocessorDefinitions "LUA_OPNAMES"
$CompileAs "Compile as C Code (/TC)"
}
}
$Project "lua"
{
$Folder "Source Files"
{
$File "lapi.c"
$File "lcode.c"
$File "ldebug.c"
$File "ldo.c"
$File "ldump.c"
$File "lfunc.c"
$File "lgc.c"
$File "llex.c"
$File "lmem.c"
$File "lundump.c"
$File "lobject.c"
$File "lopcodes.c"
$File "lparser.c"
$File "lstate.c"
$File "lstring.c"
$File "ltable.c"
$File "ltm.c"
$File "lvm.c"
$File "lzio.c"
$File "lauxlib.c"
$File "lbaselib.c"
$File "ldblib.c"
$File "liolib.c"
$File "lmathlib.c"
$File "loslib.c"
$File "ltablib.c"
$File "lstrlib.c"
$File "loadlib.c"
$File "linit.c"
}
$Folder "Header Files"
{
$File "lapi.h"
$File "lcode.h"
$File "ldebug.h"
$File "ldo.h"
$File "lfunc.h"
$File "lgc.h"
$File "llex.h"
$File "lmem.h"
$File "lundump.h"
$File "lvm.h"
$File "lzio.h"
$File "lauxlib.h"
$File "lobject.h"
$File "lopcodes.h"
$File "lparser.h"
$File "lstate.h"
$File "lstring.h"
$File "ltable.h"
$File "ltm.h"
$File "luaconf.h"
$File "lualib.h"
}
}

View file

@ -10,8 +10,10 @@ $Configuration
{
$Compiler
{
$AdditionalIncludeDirectories "$BASE;$THIRDPARTYDIR;$LUADIR"
$AdditionalIncludeDirectories "$BASE;$THIRDPARTYDIR;$LUADIR"
$EnableC++Exceptions "Yes (/EHsc)"
//$PreprocessorDefinitions "LUABIND_CPLUSPLUS_LUA"
//$CompileAs "Compile as C Code (/TC)"
}
}