Menu
▾
▴
[Wxlua-commit] wxLua/build/bakefiles globalregen.bat,1.1,1.2 wxlua.bkl,1.3,1.4 wxluabase.bkl,1.2,1.3
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:52
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/build/bakefiles Modified Files: globalregen.bat wxlua.bkl wxluabase.bkl Log Message: Fixed modules compilation Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxluabase.bkl 12 Jun 2005 22:09:12 -0000 1.2 --- wxluabase.bkl 14 Jun 2005 21:44:40 -0000 1.3 *************** *** 206,210 **** </template> ! <!-- a template for wxlua-based libraries --> <template id="wxlua-lib" template="wx-lib,wxlua-base"> <!-- we don't need to add anything else to wxlua-base template --> --- 206,210 ---- </template> ! <!-- a template for wxLua-based libraries --> <template id="wxlua-lib" template="wx-lib,wxlua-base"> <!-- we don't need to add anything else to wxlua-base template --> Index: globalregen.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/globalregen.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** globalregen.bat 12 Jun 2005 18:29:20 -0000 1.1 --- globalregen.bat 14 Jun 2005 21:44:40 -0000 1.2 *************** *** 14,18 **** ( cd ..\..\apps\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) ( cd ..\..\modules\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) ! ( cd ..\..\utils\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) echo. echo Regeneration completed. --- 14,18 ---- ( cd ..\..\apps\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) ( cd ..\..\modules\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) ! ( cd ..\..\util\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) echo. echo Regeneration completed. Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxlua.bkl 12 Jun 2005 21:31:38 -0000 1.3 --- wxlua.bkl 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 10,13 **** --- 10,14 ---- <makefile> + <!-- This is required because it contains the definitions of a lot of utils --> <include file="wxluabase.bkl"/> *************** *** 23,26 **** --- 24,84 ---- + <!-- 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 ! + In fact, the generated makefile would then contain something like: + + MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ + 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... + + --> + + <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>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> + <set var="USE_APPS">$(USE_APPS_DEFAULT)</set> + </if> + + + + + <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_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> + + <!-- --> *************** *** 28,32 **** <!-- --> ! <subproject id="utils"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> --- 86,90 ---- <!-- --> ! <subproject id="utils" cond="USE_UTIL=='1'"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> *************** *** 54,58 **** <!-- --> ! <subproject id="apps"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> --- 112,116 ---- <!-- --> ! <subproject id="apps" cond="USE_APPS=='1'"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> |
