Menu
▾
▴
[Wxlua-commit] wxLua/build/bakefiles Bakefiles.bkgen,1.2,1.3 utils.bkl,1.2,1.3 wxlua.bkl,1.4,1.5 wxluabase.bkl,1.3,1.4
|
From: John L. <jr...@us...> - 2005-11-24 21:34:30
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29076/wxLua/build/bakefiles Modified Files: Bakefiles.bkgen utils.bkl wxlua.bkl wxluabase.bkl Log Message: formatting for bakfiles added USE_WXLUAAPP, USE_WXLUAEDITAPP Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxluabase.bkl 14 Jun 2005 21:44:40 -0000 1.3 --- wxluabase.bkl 24 Nov 2005 21:34:16 -0000 1.4 *************** *** 5,14 **** ! <!-- --> ! <!-- WXLUA GENERIC BAKEFILE --> ! <!-- --> ! <!-- This bakefile can be used by all wxLua-based apps and --> ! <!-- libraries. --> ! <!-- --> <makefile> --- 5,14 ---- ! <!-- ====================================================================== --> ! <!-- WXLUA GENERIC BAKEFILE --> ! <!-- --> ! <!-- This bakefile can be used by all wxLua-based apps and --> ! <!-- libraries. --> ! <!-- ====================================================================== --> <makefile> *************** *** 19,31 **** <set var="WX_VERSION_DEFAULT">26</set> <include file="presets/wx.bkl"/> ! <!-- This one contains some utility targets --> <include file="utils.bkl"/> ! ! <!-- --> ! <!-- VARIABLES --> ! <!-- --> <!-- Some infos on the version. --> --- 19,30 ---- <set var="WX_VERSION_DEFAULT">26</set> <include file="presets/wx.bkl"/> ! <!-- This one contains some utility targets --> <include file="utils.bkl"/> ! <!-- ================================================================== --> ! <!-- VARIABLES --> ! <!-- ================================================================== --> <!-- Some infos on the version. --> *************** *** 34,42 **** <set var="WXLUA_RELEASE">1</set> <set var="WXLUA_VERSION">$(WXLUA_MAJOR).$(WXLUA_MINOR).$(WXLUA_RELEASE)</set> ! <!-- 0.0.0 must be used for stable releases; 1.0.0, 2.0.0 ... are used for development releases. --> <set var="WXLUA_SOVERSION">0.0.0</set> ! <!-- Same as WXLUA_SOVERSION just without dots --> <set var="WXLUA_MACVERSION">0</set> --- 33,41 ---- <set var="WXLUA_RELEASE">1</set> <set var="WXLUA_VERSION">$(WXLUA_MAJOR).$(WXLUA_MINOR).$(WXLUA_RELEASE)</set> ! <!-- 0.0.0 must be used for stable releases; 1.0.0, 2.0.0 ... are used for development releases. --> <set var="WXLUA_SOVERSION">0.0.0</set> ! <!-- Same as WXLUA_SOVERSION just without dots --> <set var="WXLUA_MACVERSION">0</set> *************** *** 52,57 **** <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. --> --- 51,56 ---- <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. --> *************** *** 59,65 **** <if cond="TARGETING_WIN32=='0'"></if> <!-- empty in this case... --> </set> ! <!-- some path stuff --> ! <if cond="TARGETING_WIN32=='1'"> <!-- Win32 makefiles will be put in BUILD/MSW --> --- 58,64 ---- <if cond="TARGETING_WIN32=='0'"></if> <!-- empty in this case... --> </set> ! <!-- some path stuff --> ! <if cond="TARGETING_WIN32=='1'"> <!-- Win32 makefiles will be put in BUILD/MSW --> *************** *** 70,74 **** <set var="WXLUA_BASEDIR">.</set> </if> ! <set var="WXLUA_LIBOUTPUT_FOLDER"> <if cond="TARGETING_WIN32=='1'"> --- 69,73 ---- <set var="WXLUA_BASEDIR">.</set> </if> ! <set var="WXLUA_LIBOUTPUT_FOLDER"> <if cond="TARGETING_WIN32=='1'"> *************** *** 94,98 **** <if cond="TARGETING_WIN32=='0'">lib</if> <!-- shared & static builds go to the same folder --> </set> ! <if cond="TARGETING_WIN32=='1'"> <set var="WARNINGS"> --- 93,97 ---- <if cond="TARGETING_WIN32=='0'">lib</if> <!-- shared & static builds go to the same folder --> </set> ! <if cond="TARGETING_WIN32=='1'"> <set var="WARNINGS"> *************** *** 114,124 **** <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"/> --- 113,123 ---- <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"/> *************** *** 128,141 **** <option name="WX_VERSION"/> </if> ! <set var="SUBPROJECT_POSTFIX_PATH"/> </if> - - ! <!-- --> ! <!-- NEW TAGS --> ! <!-- --> <!-- This defines a tag which includes headers on MSVC --> --- 127,138 ---- <option name="WX_VERSION"/> </if> ! <set var="SUBPROJECT_POSTFIX_PATH"/> </if> ! <!-- ================================================================== --> ! <!-- NEW TAGS --> ! <!-- ================================================================== --> <!-- This defines a tag which includes headers on MSVC --> *************** *** 149,153 **** </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> --- 146,150 ---- </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> *************** *** 158,167 **** ! ! ! ! <!-- --> ! <!-- TEMPLATES --> ! <!-- --> <!-- just a placeholder to mark the place where <lua-lib> will be placed, --- 155,161 ---- ! <!-- ================================================================== --> ! <!-- TEMPLATES --> ! <!-- ================================================================== --> <!-- just a placeholder to mark the place where <lua-lib> will be placed, *************** *** 174,178 **** library namings like wx does --> <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 --> --- 168,172 ---- library namings like wx does --> <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 --> *************** *** 183,187 **** <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 --- 177,181 ---- <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 *************** *** 190,197 **** <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> --- 184,191 ---- <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> *************** *** 201,209 **** <threading>multi</threading> </if> ! <!-- This is a non-empty variable only when using wxWidgets as a DLL --> <define>$(WX_SHAREDDEFINE)</define> </template> ! <!-- a template for wxLua-based libraries --> <template id="wxlua-lib" template="wx-lib,wxlua-base"> --- 195,203 ---- <threading>multi</threading> </if> ! <!-- This is a non-empty variable only when using wxWidgets as a DLL --> <define>$(WX_SHAREDDEFINE)</define> </template> ! <!-- a template for wxLua-based libraries --> <template id="wxlua-lib" template="wx-lib,wxlua-base"> *************** *** 214,222 **** <template id="wxlua" template="wx,wxlua-base"> <lib-path>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_OUTPUT_FOLDER)</lib-path> ! <!-- same technique used by wx_win32.bkl: this is a placeholder for the lua-lib tags so that the library order is always the exact one --> ! <__wxlua-libs-point/> </template> --- 208,216 ---- <template id="wxlua" template="wx,wxlua-base"> <lib-path>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_OUTPUT_FOLDER)</lib-path> ! <!-- same technique used by wx_win32.bkl: this is a placeholder for the lua-lib tags so that the library order is always the exact one --> ! <__wxlua-libs-point/> </template> Index: utils.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/utils.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** utils.bkl 20 Jun 2005 09:02:46 -0000 1.2 --- utils.bkl 24 Nov 2005 21:34:16 -0000 1.3 *************** *** 5,21 **** <!-- Last revision: 13/5/2005 --> ! <!-- --> ! <!-- GENERIC BAKEFILE WITH UTILITY TAGS --> ! <!-- --> ! <!-- This bakefile provides various new tags for easier --> ! <!-- target creation (in particular these tags give you --> ! <!-- the tools required to build INSTALL/UNINSTALL/RPM --> ! <!-- targets. --> <makefile> ! <!-- --> ! <!-- NEW TAGS --> ! <!-- --> <!-- Removes the $(value) file. --> --- 5,22 ---- <!-- Last revision: 13/5/2005 --> ! <!-- ====================================================================== --> ! <!-- GENERIC BAKEFILE WITH UTILITY TAGS --> ! <!-- --> ! <!-- This bakefile provides various new tags for easier --> ! <!-- target creation (in particular these tags give you --> ! <!-- the tools required to build INSTALL/UNINSTALL/RPM --> ! <!-- targets. --> ! <!-- ====================================================================== --> <makefile> ! <!-- ================================================================== --> ! <!-- NEW TAGS --> ! <!-- ================================================================== --> <!-- Removes the $(value) file. --> *************** *** 34,38 **** <!-- The MINGW format needs the "then" keyword... --> <command>-if exist $(value) then del /Q $(value)</command> ! </if> </define-tag> --- 35,39 ---- <!-- The MINGW format needs the "then" keyword... --> <command>-if exist $(value) then del /Q $(value)</command> ! </if> </define-tag> *************** *** 46,50 **** <if cond="TOOLSET=='win32'"><command>-del /S $(value)</command></if> </define-tag> ! <!-- Removes the $(value) list of files. Each file should be --> <!-- separed from the previous with a single space. --> --- 47,51 ---- <if cond="TOOLSET=='win32'"><command>-del /S $(value)</command></if> </define-tag> ! <!-- Removes the $(value) list of files. Each file should be --> <!-- separed from the previous with a single space. --> *************** *** 53,57 **** <!-- Usage sample: --> <!-- <set var="MYPRJ_HDR"> --> ! <!-- hdr1.h wx/hdr2.h --> <!-- </set> --> <!-- <modify-target target="uninstall"> --> --- 54,58 ---- <!-- Usage sample: --> <!-- <set var="MYPRJ_HDR"> --> ! <!-- hdr1.h wx/hdr2.h --> <!-- </set> --> <!-- <modify-target target="uninstall"> --> *************** *** 60,70 **** <define-tag name="rmheaders" rules="action"> <!-- First of all remove all unnecessary whitespaces and wrap long lines --> ! <set var="__tmplist">$(wrapLongLine("", value, "\\", "\t", 20))</set> ! <!-- then put the $(DESTDIR)$(INCLUDEDIR)/ string in front of all files --> <set var="__tmplist">$(" " + __tmplist)</set> <set var="__tmplist">$(__tmplist.replace(" ", " " + DESTDIR + INCLUDEDIR + DIRSEP))</set> <set var="__tmplist">$(__tmplist.replace("\t", "\t" + DESTDIR + INCLUDEDIR + DIRSEP))</set> ! <!-- RM/DEL commands can take also lists of files (thanks Vaclav!) --> <rmfile>$(__tmplist)</rmfile> --- 61,71 ---- <define-tag name="rmheaders" rules="action"> <!-- First of all remove all unnecessary whitespaces and wrap long lines --> ! <set var="__tmplist">$(wrapLongLine("", value, "\\", "\t", 20))</set> ! <!-- then put the $(DESTDIR)$(INCLUDEDIR)/ string in front of all files --> <set var="__tmplist">$(" " + __tmplist)</set> <set var="__tmplist">$(__tmplist.replace(" ", " " + DESTDIR + INCLUDEDIR + DIRSEP))</set> <set var="__tmplist">$(__tmplist.replace("\t", "\t" + DESTDIR + INCLUDEDIR + DIRSEP))</set> ! <!-- RM/DEL commands can take also lists of files (thanks Vaclav!) --> <rmfile>$(__tmplist)</rmfile> *************** *** 75,79 **** <!-- <action id="uninstall-scripts"> --> <!-- <rmdir>$(DATADIR)/myscripts</rmdir> --> ! <!-- </action> --> <define-tag name="rmdir" rules="action"> <if cond="TARGETING_WIN32=='0'"> --- 76,80 ---- <!-- <action id="uninstall-scripts"> --> <!-- <rmdir>$(DATADIR)/myscripts</rmdir> --> ! <!-- </action> --> <define-tag name="rmdir" rules="action"> <if cond="TARGETING_WIN32=='0'"> *************** *** 86,90 **** <!-- The MINGW format needs the "then" keyword... --> <command>-if exist $(value) then rmdir /S /Q $(value)</command> ! </if> </define-tag> --- 87,91 ---- <!-- The MINGW format needs the "then" keyword... --> <command>-if exist $(value) then rmdir /S /Q $(value)</command> ! </if> </define-tag> *************** *** 96,100 **** <!-- <action id="deepclean"> --> <!-- <rmintdir>$(FORMAT)</rmintdir> --> ! <!-- </action> --> <define-tag name="rmintdir" rules="action"> <rmdir>$(value)</rmdir> --- 97,101 ---- <!-- <action id="deepclean"> --> <!-- <rmintdir>$(FORMAT)</rmintdir> --> ! <!-- </action> --> <define-tag name="rmintdir" rules="action"> <rmdir>$(value)</rmdir> *************** *** 103,107 **** <rmdir>$(value)ud</rmdir> </define-tag> ! <!-- Removes *all* intermediate files from the given folder --> <!-- recursively. --> --- 104,108 ---- <rmdir>$(value)ud</rmdir> </define-tag> ! <!-- Removes *all* intermediate files from the given folder --> <!-- recursively. --> *************** *** 111,115 **** <!-- </action> --> <define-tag name="rmintfiles" rules="action"> ! <!-- remove results --> <rmfile-rec>$(value)$(DIRSEP)*.a</rmfile-rec> --- 112,116 ---- <!-- </action> --> <define-tag name="rmintfiles" rules="action"> ! <!-- remove results --> <rmfile-rec>$(value)$(DIRSEP)*.a</rmfile-rec> *************** *** 119,124 **** <rmfile-rec>$(value)$(DIRSEP)*.exp</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.so*</rmfile-rec> ! <rmfile-rec>$(value)$(DIRSEP)*.exe</rmfile-rec> ! <!-- various intermediate files for the bakefile-supported compilers --> <rmfile-rec>$(value)$(DIRSEP)*.obj</rmfile-rec> --- 120,125 ---- <rmfile-rec>$(value)$(DIRSEP)*.exp</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.so*</rmfile-rec> ! <rmfile-rec>$(value)$(DIRSEP)*.exe</rmfile-rec> ! <!-- various intermediate files for the bakefile-supported compilers --> <rmfile-rec>$(value)$(DIRSEP)*.obj</rmfile-rec> *************** *** 141,147 **** <rmfile-rec>$(value)$(DIRSEP)*.il?</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.tds</rmfile-rec> ! <rmfile-rec>$(value)$(DIRSEP)*.idb</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.map</rmfile-rec> ! <!-- autoconf --> <rmdir>$(value)$(DIRSEP)autom4te.cache</rmdir> --- 142,148 ---- <rmfile-rec>$(value)$(DIRSEP)*.il?</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.tds</rmfile-rec> ! <rmfile-rec>$(value)$(DIRSEP)*.idb</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.map</rmfile-rec> ! <!-- autoconf --> <rmdir>$(value)$(DIRSEP)autom4te.cache</rmdir> *************** *** 154,163 **** - - <!-- --> - <!-- NEW RULES --> - <!-- --> - <!-- Forces the presence of the $(id) option into the final makefile; --> <!-- this rule (which is really used more like a tag) is a tweaky way --> --- 155,162 ---- + <!-- ================================================================== --> + <!-- NEW RULES --> + <!-- ================================================================== --> <!-- Forces the presence of the $(id) option into the final makefile; --> <!-- this rule (which is really used more like a tag) is a tweaky way --> *************** *** 166,170 **** <!-- See bakefile docs for the VARS_DONT_ELIMINATE global switch. --> <!-- Usage sample: --> ! <!-- <force-opt-presence id="MY_USELESS_OPTION"/> --> <define-rule name="force-opt-presence" extends="phony"> <template id="dummytemplate_for_$(id)"> --- 165,169 ---- <!-- See bakefile docs for the VARS_DONT_ELIMINATE global switch. --> <!-- Usage sample: --> ! <!-- <force-opt-presence id="MY_USELESS_OPTION"/> --> <define-rule name="force-opt-presence" extends="phony"> <template id="dummytemplate_for_$(id)"> *************** *** 179,183 **** <!-- <cd>..</cd> --> <!-- <run>tar -cvzf tarball.tar.gz myproj/*</run> --> ! <!-- </cd-and-run> --> <define-rule name="cd-and-run" extends="action"> <template> --- 178,182 ---- <!-- <cd>..</cd> --> <!-- <run>tar -cvzf tarball.tar.gz myproj/*</run> --> ! <!-- </cd-and-run> --> <define-rule name="cd-and-run" extends="action"> <template> *************** *** 195,199 **** <if cond="FORMAT=='borland' or FORMAT=='watcom'"> <command>-cd $(__cmddir)</command> ! <command>-$(__cmdstr)</command> </if> </define-tag> --- 194,198 ---- <if cond="FORMAT=='borland' or FORMAT=='watcom'"> <command>-cd $(__cmddir)</command> ! <command>-$(__cmdstr)</command> </if> </define-tag> Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Bakefiles.bkgen 20 Nov 2005 11:35:17 -0000 1.2 --- Bakefiles.bkgen 24 Nov 2005 21:34:16 -0000 1.3 *************** *** 4,8 **** --- 4,23 ---- <bakefile-gen> + <!-- ================================================================== --> + <!-- Formats to (not) generate --> + <!-- ================================================================== --> + <disable-formats>gnu,dmars,cbx_unix,cbuilderx</disable-formats> + + <!-- List of output formats to generate: --> + <add-formats> + autoconf,borland,dmars,mingw,msvc,watcom,cbuilderx,cbx_unix,gnu + </add-formats> + + + <!-- ================================================================== --> + <!-- Input bakefiles --> + <!-- ================================================================== --> + <input> ./wxlua.bkl *************** *** 16,23 **** ! <!-- List of output formats to generate: --> ! <add-formats> ! autoconf,borland,dmars,mingw,msvc,watcom,cbuilderx,cbx_unix,gnu ! </add-formats> <!-- Directories where msw makefiles should go: --> --- 31,37 ---- ! <!-- ================================================================== --> ! <!-- Output directories --> ! <!-- ================================================================== --> <!-- Directories where msw makefiles should go: --> Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlua.bkl 14 Jun 2005 21:44:40 -0000 1.4 --- wxlua.bkl 24 Nov 2005 21:34:16 -0000 1.5 *************** *** 5,11 **** ! <!-- --> ! <!-- WXLUA MAIN BAKEFILE --> ! <!-- --> <makefile> --- 5,12 ---- ! <!-- ====================================================================== --> ! <!-- WXLUA MAIN BAKEFILE --> ! <!-- ====================================================================== --> ! <makefile> *************** *** 25,29 **** <!-- some dummy vars so that unused vars are not removed from the output: ! in fact, we do not use WX_DIR/WX_VERSION/... vars directly in this bakefile and so Bakefile would remove them from the final makefiles but this must be avoid ! --- 26,30 ---- <!-- some dummy vars so that unused vars are not removed from the output: ! in fact, we do not use WX_DIR/WX_VERSION/... vars directly in this bakefile and so Bakefile would remove them from the final makefiles but this must be avoid ! *************** *** 34,42 **** WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" ! where $(WX_DIR), $(WX_VERSION), ... expand to nothing since they are undeclared variables from MAKE's point of view... ! --> --- 35,45 ---- WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \ ! USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ! ! where $(WX_DIR), $(WX_VERSION), ... expand to nothing since they are undeclared variables from MAKE's point of view... ! --> *************** *** 46,66 **** <!-- 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>Does the wxLua applications should 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> --- 49,69 ---- <!-- 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> *************** *** 75,91 **** <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_WXLUASOCKET=='dummy'">AAA</if></set> ! <set var="dummy5"><if cond="USE_WXLUADEBUG=='dummy'">AAA</if></set> <set var="dummy6"><if cond="USE_BIN2C=='dummy'">AAA</if></set> </if> - <!-- --> - <!-- The utils --> - <!-- --> - <subproject id="utils" cond="USE_UTIL=='1'"> ! <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> --- 78,95 ---- <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 --> + <!-- ================================================================== --> <subproject id="utils" cond="USE_UTIL=='1'"> ! <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> *************** *** 93,104 **** - - <!-- --> - <!-- The modules libraries & samples --> - <!-- --> - <subproject id="modules"> ! <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)modules$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> --- 97,106 ---- + <!-- ================================================================== --> + <!-- The modules libraries & samples --> + <!-- ================================================================== --> <subproject id="modules"> ! <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)modules$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> *************** *** 106,117 **** - - <!-- --> - <!-- The wxLua applications --> - <!-- --> - <subproject id="apps" cond="USE_APPS=='1'"> ! <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> --- 108,117 ---- + <!-- ================================================================== --> + <!-- The wxLua applications --> + <!-- ================================================================== --> <subproject id="apps" cond="USE_APPS=='1'"> ! <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> *************** *** 119,126 **** - <!-- --> - <!-- Miscellaneous utility targets --> - <!-- --> <!-- <action id="docs"> --- 119,126 ---- + <!-- ================================================================== --> + <!-- Miscellaneous utility targets --> + <!-- ================================================================== --> <!-- <action id="docs"> *************** *** 132,135 **** </action> --> ! </makefile> --- 132,135 ---- </action> --> ! </makefile> |
