Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/bakefiles common.bkl, 1.5, 1.6 modules.bkl, 1.37, 1.38
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:03
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/modules/build/bakefiles Modified Files: common.bkl modules.bkl Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** common.bkl 20 May 2006 13:12:34 -0000 1.5 --- common.bkl 8 Dec 2006 13:19:59 -0000 1.6 *************** *** 21,39 **** <!-- ================================================================== --> - <!-- All the source files & header files linked above are relative to our MODULE dir. --> - <set var="FILELISTDIR">../..</set> <if cond="FORMAT!='autoconf'"> <set var="WXLUA_BASEDIR">../../..</set> <set var="WXLUA_MODULEDIR">../..</set> - <set var="SRCDIR">$(WXLUA_MODULEDIR)</set> - <set var="WXLUA_SOURCEDIR">$(WXLUA_MODULEDIR)</set> <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set> <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set> <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> </if> <if cond="FORMAT=='autoconf'"> - <set var="SRCDIR">.</set> - <!-- In this way we support makefiles created from folders != root folder; i.e. with this trick you can do: --- 21,35 ---- <!-- ================================================================== --> <if cond="FORMAT!='autoconf'"> <set var="WXLUA_BASEDIR">../../..</set> <set var="WXLUA_MODULEDIR">../..</set> <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set> <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set> <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> + + <set-srcdir>../..</set-srcdir> </if> <if cond="FORMAT=='autoconf'"> <!-- In this way we support makefiles created from folders != root folder; i.e. with this trick you can do: *************** *** 41,50 **** --> <set var="WXLUA_BASEDIR">$(top_srcdir)</set> ! <set var="WXLUA_SOURCEDIR">$(top_srcdir)/modules</set> <!-- top_builddir already ends with '/' --> ! <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)$(WXLUA_LIBOUTPUT_FOLDER)</set> ! <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set> </if> --- 37,46 ---- --> <set var="WXLUA_BASEDIR">$(top_srcdir)</set> ! <!-- <set var="WXLUA_SOURCEDIR">$(top_srcdir)/modules</set> --> <!-- top_builddir already ends with '/' --> ! <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)/$(WXLUA_LIBOUTPUT_FOLDER)</set> ! <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)/$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/bin</set> </if> *************** *** 89,96 **** <define-rule name="wxlua_lib" extends="lib"> <template> - <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> - <install-to>$(LIBDIR)</install-to> - <headers-install-to>$(INCLUDEDIR)</headers-install-to> <set var="__modname"/> --- 85,89 ---- *************** *** 116,119 **** --- 109,115 ---- <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group> <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> + + <install-to>$(LIBDIR)</install-to> + <install-headers-to>$(INCLUDEDIR)</install-headers-to> </define-tag> </define-rule> *************** *** 121,128 **** <define-rule name="wxlua_dll" extends="dll"> <template> - <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname> - <install-to>$(LIBDIR)</install-to> - <headers-install-to>$(INCLUDEDIR)</headers-install-to> <!-- The DLL version --> --- 117,121 ---- *************** *** 160,163 **** --- 153,159 ---- <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> + <install-to>$(LIBDIR)</install-to> + <install-headers-to>$(INCLUDEDIR)</install-headers-to> + <define>WXMAKINGDLL_$(value)</define> </define-tag> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** modules.bkl 24 May 2006 17:20:56 -0000 1.37 --- modules.bkl 8 Dec 2006 13:19:59 -0000 1.38 *************** *** 54,58 **** <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'"> <module-name>LUA</module-name> - <!-- WE WANT THE VERBATIM VERSION: don't enable <define>WXLUA_LUA_NEWTHREAD</define> --> <libname>lua5.1</libname> --- 54,57 ---- *************** *** 63,67 **** <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'"> <module-name>LUA</module-name> - <!-- WE WANT THE VERBATIM VERSION: don't enable <define>WXLUA_LUA_NEWTHREAD</define> --> <libname>lua5.1</libname> <dllname>lua5.1</dllname> --- 62,65 ---- *************** *** 76,112 **** </wxlua_stddll> - - - <!-- the lua lib & dll compiled with WXLUA_LUA_NEWTHREAD flag --> - <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 --> <wxlua_stdlib id="wxlua_lib" cond="SHARED=='0'"> <module-name>WXLUA</module-name> - <define>WXLUA_LUA_NEWTHREAD</define> </wxlua_stdlib> <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'"> <module-name>WXLUA</module-name> <wxlua-lib>lua</wxlua-lib> - <define>WXLUA_LUA_NEWTHREAD</define> </wxlua_stddll> --- 74,84 ---- *************** *** 157,161 **** <!-- 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_DLLOUTPUT_PATH)</dirname> --- 129,132 ---- |
