Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/bakefiles common.bkl,1.4,1.5 modules.bkl,1.31,1.32
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:14:28
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/modules/build/bakefiles Modified Files: common.bkl modules.bkl Log Message: updated all build system trying to fix SHARED builds Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** common.bkl 20 May 2006 12:01:26 -0000 1.4 --- common.bkl 20 May 2006 13:12:34 -0000 1.5 *************** *** 49,59 **** </if> ! <set var="LUALIB_SRC"> $(addPrefixToList('lua/src/', 'lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c loslib.c ltablib.c lstrlib.c loadlib.c linit.c')) </set> ! <set var="LUALIB_HDR">$(fileList('lua/include/*.h'))</set> ! ! <set var="LUA_SRC">lua/src/lua.c</set> ! <set var="LUA_HDR"></set> <set var="WXBIND_SRC">$(fileList('wxbind/src/*.cpp'))</set> --- 49,56 ---- </if> ! <set var="LUA_SRC"> $(addPrefixToList('lua/src/', 'lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c loslib.c ltablib.c lstrlib.c loadlib.c linit.c')) </set> ! <set var="LUA_HDR">$(fileList('lua/include/*.h'))</set> <set var="WXBIND_SRC">$(fileList('wxbind/src/*.cpp'))</set> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** modules.bkl 20 May 2006 12:01:26 -0000 1.31 --- modules.bkl 20 May 2006 13:12:34 -0000 1.32 *************** *** 36,40 **** <!-- ================================================================== --> ! <!-- The list of wxLua MODULES --> <!-- --> <!-- NOTE: the 'mod_' prefix in the ID is mainly because in this way the --> --- 36,40 ---- <!-- ================================================================== --> ! <!-- The list of wxLua MODULES --> <!-- --> <!-- NOTE: the 'mod_' prefix in the ID is mainly because in this way the --> *************** *** 44,70 **** <!-- ================================================================== --> ! <!-- lua must always be built inconditionally in static mode ! 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> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! ! <sources>$(LUALIB_SRC)</sources> ! <headers>$(LUALIB_HDR)</headers> ! <include>$(WXLUA_SOURCEDIR)/lua/include</include> ! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> ! <wxlike-libname prefix='lua'>lua</wxlike-libname> ! ! <install-to>$(LIBDIR)</install-to> ! <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'"> --- 44,62 ---- <!-- ================================================================== --> ! <!-- the VERBATIM lua lib & dll --> ! <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'"> ! <module-name>LUA</module-name> ! <!-- WE WANT THE VERBATIM VERSION: <define>WXLUA_LUA_NEWTHREAD</define> --> ! <libname>lua5.1</libname> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! </wxlua_stdlib> ! <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'"> ! <module-name>LUA</module-name> ! <!-- WE WANT THE VERBATIM VERSION: <define>WXLUA_LUA_NEWTHREAD</define> --> ! <libname>lua5.1</libname> ! <dllname>lua5.1</dllname> <if cond="TARGETING_WIN32=='1'"> *************** *** 72,129 **** </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 - NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> - <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> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! <include>$(WXLUA_SOURCEDIR)/lua/include</include> ! <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> ! ! <!-- avoid overwriting user's lua --> ! <exename>wxlua-lua</exename> ! ! <if cond="TARGETING_WIN32=='0'"> ! <!-- we require the standard MATH library to build the lua sources --> ! <sys-lib>m</sys-lib> </if> ! <install-to>$(BINDIR)</install-to> ! </exe> ! <!-- the wxLua lib & dll --> --- 64,95 ---- </if> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + </wxlua_stddll> + <!-- the lua lib & dll --> + <wxlua_stdlib id="lua_lib" cond="SHARED=='0'"> + <module-name>LUA</module-name> + <define>WXLUA_LUA_NEWTHREAD</define> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + </wxlua_stdlib> + <wxlua_stddll id="lua_dll" cond="SHARED=='1'"> + <module-name>LUA</module-name> + <define>WXLUA_LUA_NEWTHREAD</define> ! <if cond="TARGETING_WIN32=='1'"> ! <define>LUA_BUILD_AS_DLL</define> </if> ! <!-- see options.bkl for these --> ! <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> ! <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! </wxlua_stddll> <!-- the wxLua lib & dll --> *************** *** 142,145 **** --- 108,112 ---- <wxlua_stddll id="wxbind_dll" cond="SHARED=='1'"> <module-name>WXBIND</module-name> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 151,154 **** --- 118,122 ---- <wxlua_stddll id="wxbindstc_dll" cond="SHARED=='1' and USE_WXBINDSTC=='1'"> <module-name>WXBINDSTC</module-name> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 160,163 **** --- 128,132 ---- <wxlua_stddll id="wxluadebug_dll" cond="SHARED=='1' and USE_WXLUADEBUG=='1'"> <module-name>WXLUADEBUG</module-name> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 169,177 **** <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> --- 138,148 ---- <wxlua_stddll id="wxluasocket_dll" cond="SHARED=='1' and USE_WXLUASOCKET=='1'"> <module-name>WXLUASOCKET</module-name> + <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> ! <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 --> ! <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> |
