Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21377/modules/build/bakefiles
Modified Files:
modules.bkl
Log Message:
get rid of WX_UNICODE and WX_DEBUG (again); removed the 'verbatim' name from modules and apps; added explanatory comments about the naming of our vanilla lua; renamed our lua interpreter to just 'lua' (as for the standard lua distro); now LUA_DIR is set correctly for windows builds; now USE_SYSTEM_LUA and LUA_DIR are passed through subprojects
Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** modules.bkl 19 Dec 2006 21:12:00 -0000 1.40
--- modules.bkl 19 Dec 2006 22:24:12 -0000 1.41
***************
*** 44,54 ****
<!-- ================================================================== -->
! <!-- the VERBATIM lua lib & dll: these are needed for linking the "mod_luamodule"
! (see below); in fact, trying to link statically "mod_luamodule" with lua core
! is not a Good Thing ! See http://lua-users.org/wiki/BuildingModules to understand
why (basically because lua core gets duplicated).
! Instead we need a verbatim lua DLL to create the "wx.so/.dll" DLL without any
! dangerous duplication of code.
-->
<lib id="lua_lib" cond="SHARED=='0' and USE_SYSTEM_LUA=='0'">
--- 44,58 ----
<!-- ================================================================== -->
! <!-- the lua lib & dll: these are needed by all wxLua modules, specially for
! linking the "mod_luamodule" (see below); in fact, compiling statically the
! lua interpreter into "mod_luamodule" is not a Good Thing !
! See http://lua-users.org/wiki/BuildingModules to understand
why (basically because lua core gets duplicated).
! NOTE: this is the vanilla lua interpreter and thus we _can_ and we
! _want_ to name it exactly like the "official" lua.
! In fact, it's very important that the mod_luamodule gets linked
! against a DSO/DLL named "lua5.1[.dll]" so that our "wx[.dll]"
! can be used just like any other Lua module.
-->
<lib id="lua_lib" cond="SHARED=='0' and USE_SYSTEM_LUA=='0'">
***************
*** 70,75 ****
<dll id="lua_dll" cond="SHARED=='1' and USE_SYSTEM_LUA=='0'">
<dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname>
-
- <!-- FIXME -->
<libname>lua5.1</libname>
<dllname>lua5.1</dllname>
--- 74,77 ----
|
