Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/bakefiles common.bkl,1.3,1.4 modules.bkl,1.30,1.31 options.bkl,1.11,1.12
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:01:32
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16179/modules/build/bakefiles Modified Files: common.bkl modules.bkl options.bkl Log Message: Added luamodule; added lua DLL target Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** options.bkl 14 May 2006 12:55:56 -0000 1.11 --- options.bkl 20 May 2006 12:01:26 -0000 1.12 *************** *** 23,27 **** <set var="USE_WXLUADEBUG_DEFAULT">1</set> <set var="USE_WXLUASOCKET_DEFAULT">1</set> ! --- 23,27 ---- <set var="USE_WXLUADEBUG_DEFAULT">1</set> <set var="USE_WXLUASOCKET_DEFAULT">1</set> ! <set var="USE_LUAMODULE_DEFAULT">1</set> *************** *** 51,54 **** --- 51,60 ---- </option> + <option name="USE_LUAMODULE"> + <values>0,1</values> + <default-value>$(USE_LUAMODULE_DEFAULT)</default-value> + <description>Compile the lua module ?</description> + </option> + <if cond="TARGETING_UNIX=='1'"> <option name="INSTALL_CUSTOM_WXBIND"> *************** *** 68,71 **** --- 74,79 ---- <set var="USE_WXLUADEBUG">1</set> <set var="USE_WXLUASOCKET">1</set> + <set var="USE_LUAMODULE">1</set> + <set var="INSTALL_CUSTOM_WXBIND">0</set> </if> Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** common.bkl 29 Mar 2006 18:41:41 -0000 1.3 --- common.bkl 20 May 2006 12:01:26 -0000 1.4 *************** *** 72,75 **** --- 72,77 ---- <set var="WXLUASOCKET_HDR">$(fileList('wxluasocket/include/*.h'))</set> + <set var="LUAMODULE_SRC">$(fileList('luamodule/src/*.cpp'))</set> + <set var="LUAMODULE_HDR">$(fileList('luamodule/src/*.h'))</set> *************** *** 161,166 **** <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> ! <!-- now, shared stuff --> ! <define>$(value)_MAKINGDLL</define> </define-tag> </define-rule> --- 163,167 ---- <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> ! <define>WXMAKINGDLL_$(value)</define> </define-tag> </define-rule> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** modules.bkl 14 May 2006 12:55:56 -0000 1.30 --- modules.bkl 20 May 2006 12:01:26 -0000 1.31 *************** *** 47,54 **** NOTE: we won't use the lua_lib rule since the LUA module does not follow the same conventions followed by other modules... --> ! <lib id="mod_lua_lib" template="wxbase"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <define>WXLUA_LUA_NEWTHREAD</define> ! <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> --- 47,54 ---- NOTE: we won't use the lua_lib rule since the LUA module does not follow the same conventions followed by other modules... --> ! <lib id="mod_lua_lib" template="wxbase" cond="SHARED=='0'"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <define>WXLUA_LUA_NEWTHREAD</define> ! <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> *************** *** 64,67 **** --- 64,95 ---- <headers-install-to>$(INCLUDEDIR)</headers-install-to> </lib> + <dll id="mod_lua_dll" template="wxbase" cond="SHARED=='1'"> + <srcdir>$(WXLUA_SOURCEDIR)</srcdir> + <define>WXLUA_LUA_NEWTHREAD</define> + + <if cond="TARGETING_WIN32=='1'"> + <define>LUA_BUILD_AS_DLL</define> + </if> + + <!-- The DLL version --> + <version>$(WXLUA_VERSION)</version> + <so_version>$(WXLUA_SOVERSION)</so_version> + <mac_version>$(WXLUA_MACVERSION)</mac_version> + + <!-- see options.bkl for these --> + <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> + <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + + <sources>$(LUALIB_SRC)</sources> + <headers>$(LUALIB_HDR)</headers> + <include>$(WXLUA_SOURCEDIR)/lua/include</include> + <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname> + <wxlike-libname prefix='lua'>lua</wxlike-libname> + <wxlike-dllname prefix='lua'>lua</wxlike-dllname> + + <install-to>$(LIBDIR)</install-to> + <headers-install-to>$(INCLUDEDIR)</headers-install-to> + </dll> + <!-- this is the lua app *************** *** 69,75 **** <exe id="mod_lua" template="wxbase"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <library>mod_lua_lib</library> <sources>$(LUA_SRC)</sources> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> --- 97,111 ---- <exe id="mod_lua" template="wxbase"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <wxlua-lib>lua</wxlua-lib> <sources>$(LUA_SRC)</sources> + <if cond="TARGETING_WIN32=='1' or FORMAT=='gnu'"> + <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> + </if> + <if cond="TARGETING_WIN32=='0' and FORMAT!='gnu'"> + <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path> + </if> + + <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> *************** *** 97,100 **** --- 133,137 ---- <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'"> <module-name>WXLUA</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 105,108 **** --- 142,146 ---- <wxlua_stddll id="wxbind_dll" cond="SHARED=='1'"> <module-name>WXBIND</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 113,116 **** --- 151,155 ---- <wxlua_stddll id="wxbindstc_dll" cond="SHARED=='1' and USE_WXBINDSTC=='1'"> <module-name>WXBINDSTC</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 121,124 **** --- 160,164 ---- <wxlua_stddll id="wxluadebug_dll" cond="SHARED=='1' and USE_WXLUADEBUG=='1'"> <module-name>WXLUADEBUG</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 129,134 **** --- 169,193 ---- <wxlua_stddll id="wxluasocket_dll" cond="SHARED=='1' and USE_WXLUASOCKET=='1'"> <module-name>WXLUASOCKET</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> + <!-- the luamodule --> + <module id="mod_luamodule" template="wxlua" cond="USE_LUAMODULE=='1'"> + <srcdir>$(WXLUA_SOURCEDIR)</srcdir> + <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> + + <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... --> + <install-to>$(LIBDIR)/lua/5.1</install-to> + + <sources>$(LUAMODULE_SRC)</sources> + <headers>$(LUAMODULE_HDR)</headers> + + <!-- It's important to keep the module name 'wx' to make require("wx") work --> + <dllname>wx</dllname> + + <wxlua-allstdlibs/> + <wx-alllibs-req-bywxlua/> + </module> + <!-- since all the previous targets would generate each one a different DSP project |
