Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/bakefiles modules.bkl,1.13,1.14 options.bkl,1.6,1.7
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:01
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/modules/build/bakefiles Modified Files: modules.bkl options.bkl Log Message: fixed top_builddir problems Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** options.bkl 29 Nov 2005 23:52:11 -0000 1.6 --- options.bkl 27 Jan 2006 21:57:10 -0000 1.7 *************** *** 35,39 **** <!-- ================================================================== --> ! <!-- module enable/disable options --> <if cond="TARGETING_IDE=='0'"> <option name="USE_WXLUADEBUGLIB"> --- 35,40 ---- <!-- ================================================================== --> ! <!-- wxbind and wxlua cannot be disabled ! --> ! <if cond="TARGETING_IDE=='0'"> <option name="USE_WXLUADEBUGLIB"> *************** *** 55,59 **** skip some target and do not generate DSP files for that one. We don't want this: we want to generate DSP for all modules: the choice ! of the modules to compile will be left to the user... --> <set var="USE_WXLUADEBUGLIB">1</set> <set var="USE_WXLUASOCKETLIB">1</set> --- 56,60 ---- skip some target and do not generate DSP files for that one. We don't want this: we want to generate DSP for all modules: the choice ! of the modules to compile will be left to the user through the IDE GUI... --> <set var="USE_WXLUADEBUGLIB">1</set> <set var="USE_WXLUASOCKETLIB">1</set> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** modules.bkl 25 Jan 2006 18:35:58 -0000 1.13 --- modules.bkl 27 Jan 2006 21:57:09 -0000 1.14 *************** *** 21,40 **** <!-- ================================================================== --> ! <!-- All the source files & header files linked above are relative to our base dir --> <if cond="FORMAT!='autoconf'"> <set var="WXLUA_MODULEDIR">../..</set> ! <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)/..</set> </if> <if cond="FORMAT=='autoconf'"> <!-- In this way we support makefiles created from folders != root folder; i.e. with this trick you can do: mkdir mybuild && cd mybuild && ../configure && make --> - <set var="WXLUA_MODULEDIR">$(top_srcdir)/modules</set> <set var="WXLUA_BASEDIR">$(top_srcdir)</set> ! </if> ! <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir --> ! <set var="SRCDIR">$(WXLUA_MODULEDIR.replace('$(top_srcdir)', '..'))</set> <!-- the ldllmain.c file must be excluded ! --> --- 21,50 ---- <!-- ================================================================== --> ! <!-- All the source files & header files linked above are relative to our MODULE dir. --> <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: mkdir mybuild && cd mybuild && ../configure && make --> <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> <!-- the ldllmain.c file must be excluded ! --> *************** *** 75,80 **** <define-rule name="wxlua_lib" extends="lib"> <template> ! <srcdir>$(WXLUA_MODULEDIR)</srcdir> ! <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> <install-to>$(LIBDIR)</install-to> <headers-install-to>$(INCLUDEDIR)</headers-install-to> --- 85,90 ---- <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> *************** *** 86,95 **** <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... --> --- 96,111 ---- <set var="__modnamelow">$(__modname.lower())</set> ! <!-- ! The library name will look something like: ! libwxlua_[gtk2|x11|...][u][d]_[modulename]-[wxversion].so (or .a) ! on Unix; on win32 instead: ! libwxlua_msw[u][d]_[modulename]-[wxversion without dots].dll (or .lib) ! --> ! <wxlike-libname>$(__modnamelow)</wxlike-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)/contrib/include</include></if> <!-- to make MSVC6PRJ output look better... --> *************** *** 101,106 **** <define-rule name="wxlua_dll" extends="dll"> <template> ! <srcdir>$(WXLUA_MODULEDIR)</srcdir> ! <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname> <install-to>$(LIBDIR)</install-to> <headers-install-to>$(INCLUDEDIR)</headers-install-to> --- 117,122 ---- <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> *************** *** 113,118 **** <!-- Libraries must be put in the right order ! --> <wxlua-req-libs/> <wx-lib>adv</wx-lib> ! <wx-lib>xml</wx-lib> <!-- in case we're using the XML layout load/save system --> <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> --- 129,138 ---- <!-- Libraries must be put in the right order ! --> <wxlua-req-libs/> + <wx-lib>xrc</wx-lib> + <wx-lib>html</wx-lib> + <wx-lib>media</wx-lib> <wx-lib>adv</wx-lib> ! <wx-lib>net</wx-lib> ! <wx-lib>xml</wx-lib> <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> *************** *** 124,133 **** <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... --> --- 144,153 ---- <set var="__modnamelow">$(__modname.lower())</set> ! <wxlike-libname>$(__modnamelow)</wxlike-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)/contrib/include</include></if> <!-- to make MSVC6PRJ output look better... --> *************** *** 142,164 **** - <!-- ================================================================== --> - <!-- 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> - <dir>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dir> - </mkdir> - <mkdir id="setupdlldir"> - <dependency-of>all</dependency-of> - <dir>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dir> - </mkdir> - </if> - - - <!-- ================================================================== --> <!-- The list of wxLua MODULES --> --- 162,165 ---- *************** *** 174,184 **** the same conventions followed by other modules... --> <lib id="mod_lua_lib" template="wxbase"> ! <srcdir>$(WXLUA_MODULEDIR)</srcdir> <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> ! <libname>lua</libname> <install-to>$(LIBDIR)</install-to> --- 175,185 ---- the same conventions followed by other modules... --> <lib id="mod_lua_lib" template="wxbase"> ! <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <define>WXLUA_CODE</define> <sources>$(LUA_SRC) $(LUALIB_SRC)</sources> <headers>$(LUA_HDR) $(LUALIB_HDR)</headers> ! <include>$(WXLUA_SOURCEDIR)/lua/include</include> ! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> ! <wxlike-libname>lua</wxlike-libname> <install-to>$(LIBDIR)</install-to> *************** *** 189,197 **** NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> <exe id="mod_lua" template="wxbase"> ! <srcdir>$(WXLUA_MODULEDIR)</srcdir> <library>mod_lua_lib</library> <sources>lua/src/lua/lua.c</sources> ! <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> ! <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname> <exename>lua</exename> <if cond="TARGETING_WIN32=='0'"> --- 190,198 ---- 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> <library>mod_lua_lib</library> <sources>lua/src/lua/lua.c</sources> ! <include>$(WXLUA_SOURCEDIR)/lua/include</include> ! <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <exename>lua</exename> <if cond="TARGETING_WIN32=='0'"> *************** *** 206,212 **** --- 207,217 ---- <!-- the wxLua lib & dll --> <wxlua_lib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> + <!-- This include is necessary in order to access to art/ folder of wxLua --> + <include>./$(WXLUA_BASEDIR)</include> <module-name>WXLUA</module-name> </wxlua_lib> <wxlua_dll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'"> + <!-- This include is necessary in order to access to art/ folder of wxLua --> + <include>./$(WXLUA_BASEDIR)</include> <module-name>WXLUA</module-name> </wxlua_dll> |
