Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/bakefiles modules.bkl,1.10,1.11
|
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/modules/build/bakefiles Modified Files: modules.bkl Log Message: updated bakefiles Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** modules.bkl 24 Nov 2005 21:34:16 -0000 1.10 --- modules.bkl 23 Jan 2006 19:38:30 -0000 1.11 *************** *** 6,10 **** <!-- ====================================================================== --> ! <!-- WXLUA BAKEFILE --> <!-- --> <!-- The bakefile used to build all the modules. --> --- 6,10 ---- <!-- ====================================================================== --> ! <!-- WXLUA MODULES BAKEFILE --> <!-- --> <!-- The bakefile used to build all the modules. --> *************** *** 13,46 **** <makefile> ! <!-- This is a bakefile, that is, a generic template used to --> ! <!-- generate makefiles ALL supported compilers. --> ! <!-- To use this project file type something like: --> ! <!-- bakefile -fmsvc modules.bkl --> ! <!-- See http://bakefile.sourceforge.net for more info. --> ! ! <!-- This file contains the wxLua template --> <include file="../../../build/bakefiles/wxluabase.bkl"/> <!-- ================================================================== --> ! <!-- SOURCE LIST --> <!-- ================================================================== --> ! <!-- This one contains the lists of all source & header files --> ! <include file="sources.bkl"/> ! <!-- ================================================================== --> ! <!-- VARIABLES --> ! <!-- ================================================================== --> - <!-- All the source files & header files linked above are relative to our base dir --> - <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">..$(DIRSEP)..</set></if> - <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if> - <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)$(DIRSEP)..</set> - <!-- Put all the objects files generated by --> - <!-- the compilation in a subfolder of BUILD --> - <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if> --- 13,52 ---- <makefile> ! <!-- This file contains the wxLua template --> <include file="../../../build/bakefiles/wxluabase.bkl"/> <!-- ================================================================== --> ! <!-- SOURCES and HEADERS LIST --> <!-- ================================================================== --> ! <!-- All the source files & header files linked above are relative to our base dir --> ! <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">../..</set></if> ! <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if> ! <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)/..</set> + <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir --> + <set var="SRCDIR">$(WXLUA_MODULEDIR)</set> ! <!-- the ldllmain.c file must be excluded ! --> ! <set var="LUA_SRC">$(fileList('lua/src/*.c', '*dll*'))</set> ! <set var="LUA_HDR">$(fileList('lua/include/*.h'))</set> ! ! <set var="LUALIB_SRC">$(fileList('lua/src/lib/*.c'))</set> ! <set var="LUALIB_HDR">$(fileList('lua/src/lib/*.h'))</set> ! ! <set var="WXBIND_SRC">$(fileList('wxbind/src/*.cpp'))</set> ! <set var="WXBIND_HDR">$(fileList('wxbind/include/*.h'))</set> ! ! <set var="WXLUA_SRC">$(fileList('wxlua/src/*.cpp'))</set> ! <set var="WXLUA_HDR">$(fileList('wxlua/include/*.h'))</set> ! ! <set var="WXLUADEBUG_SRC">$(fileList('wxluadebug/src/*.cpp'))</set> ! <set var="WXLUADEBUG_HDR">$(fileList('wxluadebug/include/*.h'))</set> ! ! <set var="WXLUASOCKET_SRC">$(fileList('wxluasocket/src/*.cpp'))</set> ! <set var="WXLUASOCKET_HDR">$(fileList('wxluasocket/include/*.h'))</set> *************** *** 61,64 **** --- 67,73 ---- <template> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> + <install-to>$(LIBDIR)</install-to> + <headers-install-to>$(INCLUDEDIR)</headers-install-to> + <set var="__modname"/> </template> *************** *** 67,79 **** <set var="__modnamelow">$(__modname.lower())</set> - <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set> - <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set> - <libname>$(__modnamelow)</libname> ! <sources>$(__modsrc)</sources> ! <headers>$(__modhdr)</headers> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> --- 76,85 ---- <set var="__modnamelow">$(__modname.lower())</set> <libname>$(__modnamelow)</libname> ! <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> ! <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> *************** *** 86,89 **** --- 92,97 ---- <template> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname> + <install-to>$(LIBDIR)</install-to> + <headers-install-to>$(INCLUDEDIR)</headers-install-to> <!-- The DLL version --> *************** *** 105,117 **** <set var="__modnamelow">$(__modname.lower())</set> - <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set> - <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set> - <libname>$(__modnamelow)</libname> ! <sources>$(__modsrc)</sources> ! <headers>$(__modhdr)</headers> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> --- 113,122 ---- <set var="__modnamelow">$(__modname.lower())</set> <libname>$(__modnamelow)</libname> ! <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> ! <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> *************** *** 120,135 **** <!-- now, shared stuff --> ! <define>A2D$(__modname)MAKINGDLL</define> </define-tag> </define-rule> <!-- ================================================================== --> <!-- AUXILIARY TARGETS --> <!-- ================================================================== --> ! <if cond="TARGETING_IDE=='0' and TARGETING_WIN32=='1'"> ! <!-- the two folders where output will be stored --> <mkdir id="setuplibdir"> <dependency-of>all</dependency-of> --- 125,141 ---- <!-- now, shared stuff --> ! <define>$(value)_MAKINGDLL</define> </define-tag> </define-rule> + <!-- ================================================================== --> <!-- AUXILIARY TARGETS --> <!-- ================================================================== --> ! <if cond="TARGETING_IDE=='0' and TARGETING_WIN32=='1'"> ! <!-- the two folders where output will be stored --> <mkdir id="setuplibdir"> <dependency-of>all</dependency-of> *************** *** 140,166 **** <dir>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dir> </mkdir> - </if> <!-- ================================================================== --> <!-- The list of wxLua MODULES --> ! <!-- --> ! <!-- NOTE: the 'mod_' prefix in the ID is mainly because in this way the --> ! <!-- DSP files generated by this bakefile makes clear for the user what --> ! <!-- is a module, what is an app (since app bakefile uses 'app_' prefix) --> ! <!-- and what is a util... --> <!-- ================================================================== --> - <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir --> - <set var="SRCDIR">$(WXLUA_MODULEDIR)</set> - <!-- 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"> <define>WXLUA_CODE</define> ! <sources>$(lua_src) $(lualib_src)</sources> ! <headers>(lua_hdr) $(lualib_hdr)</headers> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> --- 146,169 ---- <dir>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dir> </mkdir> + </if> <!-- ================================================================== --> <!-- The list of wxLua MODULES --> ! <!-- --> ! <!-- NOTE: the 'mod_' prefix in the ID is mainly because in this way the --> ! <!-- DSP files generated by this bakefile makes clear for the user what --> ! <!-- is a module, what is an app (since app bakefile uses 'app_' prefix) --> ! <!-- and what is a util... --> <!-- ================================================================== --> <!-- 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"> <define>WXLUA_CODE</define> ! <sources>$(LUA_SRC) $(LUALIB_SRC)</sources> ! <headers>(LUA_HDR) $(LUALIB_HDR)</headers> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> *************** *** 170,174 **** <!-- this is the lua app NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> ! <exe id="mod_lua"> <library>mod_lua_lib</library> <sources>lua/src/lua/lua.c</sources> --- 173,177 ---- <!-- 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"> <library>mod_lua_lib</library> <sources>lua/src/lua/lua.c</sources> *************** *** 223,231 **** <set var="MSVC6PRJ_MERGED_TARGETS"> mod_wxlua=wxlua_lib+wxlua_dll ! mod_wxbind=wxbind_lib+wxbind_dll ! mod_wxluadebug=wxluadebug_lib+wxluadebug_dll ! mod_wxluasocket=wxluasocket_lib+wxluasocket_dll </set> - </makefile> --- 226,233 ---- <set var="MSVC6PRJ_MERGED_TARGETS"> mod_wxlua=wxlua_lib+wxlua_dll ! mod_wxbind=wxbind_lib+wxbind_dll ! mod_wxluadebug=wxluadebug_lib+wxluadebug_dll ! mod_wxluasocket=wxluasocket_lib+wxluasocket_dll </set> </makefile> |
