Menu
▾
▴
wxlua-commit
|
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/build/bakefiles Modified Files: wxlua.bkl wxluabase.bkl Log Message: updated bakefiles Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxluabase.bkl 24 Nov 2005 21:34:16 -0000 1.4 --- wxluabase.bkl 23 Jan 2006 19:38:29 -0000 1.5 *************** *** 6,13 **** <!-- ====================================================================== --> ! <!-- WXLUA GENERIC BAKEFILE --> <!-- --> ! <!-- This bakefile can be used by all wxLua-based apps and --> ! <!-- libraries. --> <!-- ====================================================================== --> --- 6,12 ---- <!-- ====================================================================== --> ! <!-- WXLUA GENERIC BAKEFILE --> <!-- --> ! <!-- This bakefile can be used by all wxLua-based apps and libraries. --> <!-- ====================================================================== --> *************** *** 17,25 **** <!-- This file contains the declaration of the WX & WX-LIB templates --> ! <set var="WX_VERSION_DEFAULT">26</set> ! <include file="presets/wx.bkl"/> ! <!-- This one contains some utility targets --> ! <include file="utils.bkl"/> --- 16,23 ---- <!-- This file contains the declaration of the WX & WX-LIB templates --> ! <include file="wxhacks.bkl"/> ! <!-- This one contains some utility targets ! <include file="utils.bkl"/> --> *************** *** 41,58 **** <set var="WXLUA_MACVERSION">0</set> ! <!-- A simple variable used to understand if we are --> ! <!-- creating a makefile for a Win32 target or a more --> ! <!-- generic linux/GNU-based system. --> ! <set var="TARGETING_WIN32"> ! <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if> ! <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if> ! </set> ! <set var="TARGETING_IDE"> ! <if cond="FORMAT=='msvc6prj' or FORMAT=='cbuilderx'">1</if> ! <if cond="FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">0</if> ! </set> ! <set var="WXLUA_LIBPOSTFIX"> - <!-- Use same naming conventions as for wxWidgets. --> <if cond="TARGETING_WIN32=='1'">$(WXLIBPOSTFIX)</if> <if cond="TARGETING_WIN32=='0'"></if> <!-- empty in this case... --> --- 39,44 ---- <set var="WXLUA_MACVERSION">0</set> ! <!-- Use same naming conventions as for wxWidgets. --> <set var="WXLUA_LIBPOSTFIX"> <if cond="TARGETING_WIN32=='1'">$(WXLIBPOSTFIX)</if> <if cond="TARGETING_WIN32=='0'"></if> <!-- empty in this case... --> *************** *** 73,77 **** <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_lib </if> <if cond="TARGETING_WIN32=='0'"> --- 59,63 ---- <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_lib$(WXLUA_LIBPOSTFIX) </if> <if cond="TARGETING_WIN32=='0'"> *************** *** 82,86 **** <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_dll </if> <if cond="TARGETING_WIN32=='0'"> --- 68,72 ---- <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_dll$(WXLUA_LIBPOSTFIX) </if> <if cond="TARGETING_WIN32=='0'"> *************** *** 95,156 **** <if cond="TARGETING_WIN32=='1'"> - <set var="WARNINGS"> - <if cond="WX_DEBUG=='1'">max</if> - <if cond="WX_DEBUG=='0'">no</if> - </set> - <set var="DEBUGINFO"> - <if cond="WX_DEBUG=='1'">on</if> - <if cond="WX_DEBUG=='0'">off</if> - </set> - <set var="DEBUGRUNTIME"> - <if cond="WX_DEBUG=='1'">on</if> - <if cond="WX_DEBUG=='0'">off</if> - </set> - <set var="OPTIMIZEFLAG"> - <if cond="WX_DEBUG=='1'">off</if> - <if cond="WX_DEBUG=='0'">speed</if> - </set> - <set var="WX_SHAREDDEFINE"> - <if cond="WX_SHARED=='1'">WXUSINGDLL</if> - </set> - <set var="SUBPROJECT_POSTFIX_PATH">build$(DIRSEP)msw</set> </if> <if cond="TARGETING_WIN32=='0'"> - <set var="WX_SHAREDDEFINE"/> - - <if cond="FORMAT=='autoconf'"> - <option name="WX_DEBUG"/> - <option name="WX_UNICODE"/> - <option name="WX_SHARED"/> - <option name="WX_DIR"/> - <option name="WX_VERSION"/> - </if> - <set var="SUBPROJECT_POSTFIX_PATH"/> </if> - <!-- ================================================================== --> - <!-- NEW TAGS --> - <!-- ================================================================== --> - - <!-- This defines a tag which includes headers on MSVC --> - <!-- Note that $(value) is stuck in there by bakefile, --> - <!-- and is the value between the beginning and end tag. --> - <define-tag name="headers" rules="dll,lib,exe"> - <if cond="FORMAT=='msvc6prj'"> - <msvc-project-files> - $(value) - </msvc-project-files> - </if> - </define-tag> - - <define-tag name="run-tarball" rules="action"> - <command>tar -cvzf $(value) --exclude-from=$(WXLUA_BASEDIR)$(DIRSEP)build$(DIRSEP)bakefiles$(DIRSEP)excludelist.txt wxLua/*</command> - </define-tag> - <define-tag name="run-zip" rules="action"> - <command>zip -r9 $(value) $(WXLUA_BASEDIR)$(DIRSEP)* -x *.pdb -x *.log -x *.o* -x *.#* -x *.csm -x *.il?</command> - </define-tag> --- 81,94 ---- <if cond="TARGETING_WIN32=='1'"> <set var="SUBPROJECT_POSTFIX_PATH">build$(DIRSEP)msw</set> </if> <if cond="TARGETING_WIN32=='0'"> <set var="SUBPROJECT_POSTFIX_PATH"/> </if> + <!-- 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> *************** *** 162,166 **** thanks to the order precedence declaration below it: --> <define-tag name="__wxlua-libs-point" rules="exe,dll,module"/> ! <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/> <!-- our <lua-lib> tag is simple: it just declares the dependency from the --- 100,104 ---- thanks to the order precedence declaration below it: --> <define-tag name="__wxlua-libs-point" rules="exe,dll,module"/> ! <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/> <!-- our <lua-lib> tag is simple: it just declares the dependency from the *************** *** 169,201 **** <define-tag name="wxlua-lib" rules="exe,dll,module"><sys-lib>$(value)</sys-lib></define-tag> ! <!-- this tag includes the wxLua required libraries, it will be defined ! later in options.bkl --> ! <define-tag name="wxlua-req-libs" rules="exe,dll,module"/> ! <!-- some tag infos --> <tag-info name="wxlua-lib" position="before:wxlua-req-libs"/> ! <tag-info name="wxlua-req-libs" position="before:__wxlua-libs-point"/> <tag-info name="wx-lib" position="after:__wxlua-libs-point"/> <!-- the generic template for wxLua-based libs/apps: this does not derive ! from wx or from wx-lib so that these templates can be added later to ! create templates specific for wxlua-based libs and templates specific ! for wxlua-based apps --> ! <template id="wxlua-base"> <!-- an additional include & link path are required not only on win32 but also on *nix: when compiling the samples or the library the user has not installed the library yet ! --> <include>$(WXLUA_BASEDIR)$(DIRSEP)modules</include> - - <if cond="TARGETING_WIN32=='1'"> - <warnings>$(WARNINGS)</warnings> - <optimize>$(OPTIMIZEFLAG)</optimize> - <debug-info>$(DEBUGINFO)</debug-info> - <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs> - <threading>multi</threading> - </if> - - <!-- This is a non-empty variable only when using wxWidgets as a DLL --> - <define>$(WX_SHAREDDEFINE)</define> </template> --- 107,128 ---- <define-tag name="wxlua-lib" rules="exe,dll,module"><sys-lib>$(value)</sys-lib></define-tag> ! <!-- this tag includes the wxLua required libraries, it will be defined ! later in options.bkl --> ! <define-tag name="wxlua-req-libs" rules="exe,dll,module"/> ! <!-- some tag infos --> <tag-info name="wxlua-lib" position="before:wxlua-req-libs"/> ! <tag-info name="wxlua-req-libs" position="before:__wxlua-libs-point"/> <tag-info name="wx-lib" position="after:__wxlua-libs-point"/> <!-- the generic template for wxLua-based libs/apps: this does not derive ! from wx or from wx-lib except for 'wxbase' so that these templates can ! be added later to create templates specific for wxlua-based libs and ! templates specific for wxlua-based apps --> ! <template id="wxlua-base" template="wxbase"> <!-- an additional include & link path are required not only on win32 but also on *nix: when compiling the samples or the library the user has not installed the library yet ! --> <include>$(WXLUA_BASEDIR)$(DIRSEP)modules</include> </template> Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlua.bkl 24 Nov 2005 21:34:16 -0000 1.5 --- wxlua.bkl 23 Jan 2006 19:38:29 -0000 1.6 *************** *** 11,18 **** --- 11,23 ---- <makefile> + <using module="pkgconfig"/> + <!-- This is required because it contains the definitions of a lot of utils --> <include file="wxluabase.bkl"/> + <!-- This file contains the list of global WXLUA options --> + <include file="options.bkl"/> + <!-- This file contains the list of UTILS options --> <include file="../../util/build/bakefiles/options.bkl"/> *************** *** 44,72 **** --> ! <set var="USE_UTIL_DEFAULT">1</set> ! <set var="USE_APPS_DEFAULT">1</set> ! ! <!-- options not tied to a specific module --> ! <if cond="TARGETING_IDE=='0'"> ! ! <option name="USE_UTIL"> ! <values>0,1</values> ! <default-value>$(USE_UTIL_DEFAULT)</default-value> ! <description>Does the wxLua utilities should be compiled ?</description> ! </option> ! <option name="USE_APPS"> ! <values>0,1</values> ! <default-value>$(USE_APPS_DEFAULT)</default-value> ! <description>Should the wxLua applications be compiled ?</description> ! </option> ! ! </if> ! ! <if cond="TARGETING_IDE=='1'"> ! ! <!-- IDEs are less flexible; we have to set these as variables with the default ! values --> ! <set var="USE_UTIL">$(USE_UTIL_DEFAULT)</set> ! <set var="USE_APPS">$(USE_APPS_DEFAULT)</set> </if> --- 49,57 ---- --> ! <if cond="TARGETING_WIN32=='1'"> ! <set var="VARS_DONT_ELIMINATE" append="1"> ! WX_DIR WX_VERSION WX_SHARED USE_WXLUASOCKETLIB USE_WXLUADEBUGLIB ! USE_BIN2C USE_WXLUAAPP USE_WXLUAEDITAPP ! </set> </if> *************** *** 74,89 **** - <if cond="TARGETING_WIN32=='1'"> - <set var="dummy1"><if cond="WX_DIR=='dummy'">AAA</if></set> - <set var="dummy2"><if cond="WX_VERSION=='dummy'">AAA</if></set> - <set var="dummy3"><if cond="WX_SHARED=='dummy'">AAA</if></set> - <set var="dummy4"><if cond="USE_WXLUASOCKETLIB=='dummy'">AAA</if></set> - <set var="dummy5"><if cond="USE_WXLUADEBUGLIB=='dummy'">AAA</if></set> - <set var="dummy6"><if cond="USE_BIN2C=='dummy'">AAA</if></set> - <set var="dummy7"><if cond="USE_WXLUAAPP=='dummy'">AAA</if></set> - <set var="dummy8"><if cond="USE_WXLUAEDITAPP=='dummy'">AAA</if></set> - </if> - - <!-- ================================================================== --> <!-- The utils --> --- 59,62 ---- *************** *** 123,126 **** --- 96,103 ---- <!-- ================================================================== --> + <pkgconfig id="pkgconfig" cond="FORMAT=='autoconf'"> + <files>build/autoconf/wxlua.pc</files> + </pkgconfig> + <!-- <action id="docs"> |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X