Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/bakefiles options.bkl,1.1,1.2
|
From: Francesco <fr...@us...> - 2005-06-12 21:21:49
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17375/modules/build/bakefiles Modified Files: options.bkl Log Message: Added bakefile build system Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** options.bkl 12 Jun 2005 18:29:20 -0000 1.1 --- options.bkl 12 Jun 2005 21:21:10 -0000 1.2 *************** *** 6,10 **** <!-- --> ! <!-- WXLUA OPTIONS BAKEFILE --> <!-- --> --- 6,10 ---- <!-- --> ! <!-- WXLUA MODULES OPTIONS BAKEFILE --> <!-- --> *************** *** 12,39 **** <!-- --> ! <!-- The list of wxArt2d OPTIONS DEFAULTS --> <!-- --> <!-- module enable/disable option defaults --> ! <set var="A2D_AGGDRAWER_DEFAULT">1</set> ! <set var="A2D_ARTBASE_DEFAULT">1</set> ! <set var="A2D_CANEXTOBJ_DEFAULT">1</set> ! <set var="A2D_CANVAS_DEFAULT">1</set> ! <set var="A2D_CURVES_DEFAULT">1</set> ! <set var="A2D_DOCVIEW_DEFAULT">1</set> ! <set var="A2D_EDITOR_DEFAULT">1</set> ! <set var="A2D_GDSIO_DEFAULT">1</set> ! <set var="A2D_KBOOL_DEFAULT">1</set> ! <set var="A2D_KEYIO_DEFAULT">1</set> ! <set var="A2D_LUAWRAPS_DEFAULT">0</set> ! <set var="A2D_STSL_DEFAULT">1</set> ! <set var="A2D_SVGIO_DEFAULT">1</set> ! <set var="A2D_XMLPARSE_DEFAULT">1</set> ! ! <!-- miscellaneous --> ! <set var="A2D_SAMPLES_DEFAULT">1</set> ! <set var="A2D_CVGIO_DEFAULT">1</set> ! ! --- 12,22 ---- <!-- --> ! <!-- The list of wxLua OPTIONS DEFAULTS --> <!-- --> <!-- module enable/disable option defaults --> ! <set var="USE_WXLUADEBUG_DEFAULT">1</set> ! <set var="USE_WXLUASOCKET_DEFAULT">1</set> ! *************** *** 43,142 **** <!-- --> ! <!-- options not tied to a specific module --> <if cond="TARGETING_IDE=='0'"> ! <option name="SAMPLES"> <values>0,1</values> ! <default-value>$(A2D_SAMPLES_DEFAULT)</default-value> ! <description>Does the samples need to be compiled ?</description> </option> ! <option name="WXART2D_USE_CVGIO"> <values>0,1</values> ! <default-value>$(A2D_CVGIO_DEFAULT)</default-value> ! <description>Does the CVG support need to be compiled ?</description> </option> </if> <if cond="TARGETING_IDE=='1'"> - <set var="SAMPLES">$(A2D_SAMPLES_DEFAULT)</set> - </if> - - <!-- module enable/disable options --> - <if cond="TARGETING_IDE=='0'"> - <option name="WXART2D_USE_AGGDRAWER"> - <values>0,1</values> - <default-value>$(A2D_AGGDRAWER_DEFAULT)</default-value> - <description>Does AGGDRAWER module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_ARTBASE"> - <values>0,1</values> - <default-value>$(A2D_ARTBASE_DEFAULT)</default-value> - <description>Does ARTBAES module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_CANEXTOBJ"> - <values>0,1</values> - <default-value>$(A2D_CANEXTOBJ_DEFAULT)</default-value> - <description>Does CANEXTOBJ module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_CANVAS"> - <values>0,1</values> - <default-value>$(A2D_CANVAS_DEFAULT)</default-value> - <description>Does CANVAS module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_CURVES"> - <values>0,1</values> - <default-value>$(A2D_CURVES_DEFAULT)</default-value> - <description>Does CURVES module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_DOCVIEW"> - <values>0,1</values> - <default-value>$(A2D_DOCVIEW_DEFAULT)</default-value> - <description>Does DOCVIEW module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_EDITOR"> - <values>0,1</values> - <default-value>$(A2D_EDITOR_DEFAULT)</default-value> - <description>Does EDITOR module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_GDSIO"> - <values>0,1</values> - <default-value>$(A2D_GDSIO_DEFAULT)</default-value> - <description>Does GDSIO module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_KBOOL"> - <values>0,1</values> - <default-value>$(A2D_KBOOL_DEFAULT)</default-value> - <description>Does KBOOL module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_KEYIO"> - <values>0,1</values> - <default-value>$(A2D_KEYIO_DEFAULT)</default-value> - <description>Does KEYIO module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_LUAWRAPS"> - <values>0,1</values> - <default-value>$(A2D_LUAWRAPS_DEFAULT)</default-value> - <description>Does LUAWRAPS module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_STSL"> - <values>0,1</values> - <default-value>$(A2D_STSL_DEFAULT)</default-value> - <description>Does STSL module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_SVGIO"> - <values>0,1</values> - <default-value>$(A2D_SVGIO_DEFAULT)</default-value> - <description>Does SVGIO module need to be compiled ?</description> - </option> - <option name="WXART2D_USE_XMLPARSE"> - <values>0,1</values> - <default-value>$(A2D_XMLPARSE_DEFAULT)</default-value> - <description>Does XMLPARSE module need to be compiled ?</description> - </option> - </if> - <if cond="TARGETING_IDE=='1'"> - - <!-- this one does not make Bakefile skip any target so it can also be zero... --> - <set var="WXART2D_USE_CVGIO">$(A2D_CVGIO_DEFAULT)</set> <!-- here we are forced to use all '1' because otherwise Bakefile would simply --- 26,45 ---- <!-- --> ! <!-- module enable/disable options --> <if cond="TARGETING_IDE=='0'"> ! <option name="USE_WXLUADEBUG"> <values>0,1</values> ! <default-value>$(USE_WXLUADEBUG_DEFAULT)</default-value> ! <description>Does the wxLua debug support need to be compiled ?</description> </option> ! <option name="USE_WXLUASOCKET"> <values>0,1</values> ! <default-value>$(USE_WXLUASOCKET_DEFAULT)</default-value> ! <description>Does the wxLua socket support need to be compiled ?</description> </option> </if> <if cond="TARGETING_IDE=='1'"> <!-- here we are forced to use all '1' because otherwise Bakefile would simply *************** *** 144,337 **** 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="WXART2D_USE_AGGDRAWER">1</set> ! <set var="WXART2D_USE_ARTBASE">1</set> ! <set var="WXART2D_USE_CANEXTOBJ">1</set> ! <set var="WXART2D_USE_CANVAS">1</set> ! <set var="WXART2D_USE_CURVES">1</set> ! <set var="WXART2D_USE_DOCVIEW">1</set> ! <set var="WXART2D_USE_EDITOR">1</set> ! <set var="WXART2D_USE_GDSIO">1</set> ! <set var="WXART2D_USE_KBOOL">1</set> ! <set var="WXART2D_USE_KEYIO">1</set> ! <set var="WXART2D_USE_LUAWRAPS">1</set> ! <set var="WXART2D_USE_STSL">1</set> ! <set var="WXART2D_USE_SVGIO">1</set> ! <set var="WXART2D_USE_XMLPARSE">1</set> ! </if> ! ! <define-tag name="ide-modules-defines" rules="lib,dll"> ! <define>wxART2D_USE_CVGIO=$(A2D_CVGIO_DEFAULT)</define> ! ! <define>wxART2D_USE_AGGDRAWER=$(A2D_AGGDRAWER_DEFAULT)</define> ! <define>wxART2D_USE_ARTBASE=$(A2D_ARTBASE_DEFAULT)</define> ! <define>wxART2D_USE_CANEXTOBJ=$(A2D_CANEXTOBJ_DEFAULT)</define> ! <define>wxART2D_USE_CANVAS=$(A2D_CANVAS_DEFAULT)</define> ! <define>wxART2D_USE_CURVES=$(A2D_CURVES_DEFAULT)</define> ! <define>wxART2D_USE_DOCVIEW=$(A2D_DOCVIEW_DEFAULT)</define> ! <define>wxART2D_USE_EDITOR=$(A2D_EDITOR_DEFAULT)</define> ! <define>wxART2D_USE_GDSIO=$(A2D_GDSIO_DEFAULT)</define> ! <define>wxART2D_USE_KBOOL=$(A2D_KBOOL_DEFAULT)</define> ! <define>wxART2D_USE_KEYIO=$(A2D_KEYIO_DEFAULT)</define> ! <define>wxART2D_USE_LUAWRAPS=$(A2D_LUAWRAPS_DEFAULT)</define> ! <define>wxART2D_USE_STSL=$(A2D_STSL_DEFAULT)</define> ! <define>wxART2D_USE_SVGIO=$(A2D_SVGIO_DEFAULT)</define> ! <define>wxART2D_USE_XMLPARSE=$(A2D_XMLPARSE_DEFAULT)</define> ! ! <define>wxART2D_USING_IDE</define> ! </define-tag> ! ! ! ! ! <!-- --> ! <!-- SOME OPTIONS-DEPENDENT STUFF --> ! <!-- --> ! ! <if cond="TARGETING_IDE=='0'"><set var="INCLUDE_SWITCH">$(__INCLUDE_ARG)</set></if> ! <if cond="TARGETING_IDE=='0'"><set var="LIBPATH_SWITCH">$(__LIBDIR_ARG)</set></if> ! <if cond="TARGETING_IDE=='0'"><set var="DEFINE_SWITCH">$(__DEFINE_ARG)</set></if> ! ! ! <!-- for the SHARED defines --> ! <if cond="TARGETING_IDE=='0'"> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_AGGDRAWER=='1'">$(DEFINE_SWITCH)A2DAGGDRAWERMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_ARTBASE=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DARTBASEMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_CANEXTOBJ=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DCANEXTOBJMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_CANVAS=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DCANVASMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_CURVES=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DCURVESMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_DOCVIEW=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DDOCVIEWMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_EDITOR=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DEDITORMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DGENERALMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_GDSIO=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DGDSIOMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_KBOOL=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DKBOOLMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_KEYIO=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DKEYIOMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_LUAWRAPS=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DLUAWRAPSMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_STSL=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DSTSLMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_SVGIO=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DSVGIOMAKINGDLL</if></set> ! <set var="SHARED_DEFINES"><if cond="WX_SHARED=='1' and WXART2D_USE_XMLPARSE=='1'">$(SHARED_DEFINES) $(DEFINE_SWITCH)A2DXMLPARSEMAKINGDLL</if></set> ! ! <define-tag name="shared-defines" rules="lib,dll,exe"> ! <cppflags>$(SHARED_DEFINES)</cppflags> ! </define-tag> ! </if> ! <if cond="TARGETING_IDE=='1'"> ! <define-tag name="shared-defines" rules="lib,dll,exe"> ! <if cond="WX_SHARED=='1'"><define>A2DAGGDRAWERMAKINGDLL</define></if> ! </define-tag> ! </if> ! ! ! <!-- for the thirdyparty paths --> ! ! <set var="AGG_INCLUDE_PATH"> ! $(WXART2D_BASEDIR)$(DIRSEP)thirdparty$(DIRSEP)agg2$(DIRSEP)include ! </set> ! <set var="EXPAT_INCLUDE_PATH"> ! $(WXART2D_BASEDIR)$(DIRSEP)thirdparty$(DIRSEP)expat$(DIRSEP)include ! </set> ! <set var="FREETYPE_INCLUDE_PATH"> ! $(WXART2D_BASEDIR)$(DIRSEP)thirdparty$(DIRSEP)freetype$(DIRSEP)include ! </set> ! <set var="LUA_INCLUDE_PATH"> ! $(WXART2D_BASEDIR)$(DIRSEP)thirdparty$(DIRSEP)wxLua$(DIRSEP)include ! </set> ! ! <set var="AGG_LIB_PATH"> ! $(WXART2D_BASEDIR)$(DIRSEP)thirdparty$(DIRSEP)agg2$(DIRSEP)lib ! </set> ! <set var="EXPAT_LIB_PATH"> ! $(WXART2D_BASEDIR)$(DIRSEP)thirdparty$(DIRSEP)expat$(DIRSEP)lib ! </set> ! <set var="FREETYPE_LIB_PATH"> ! $(WXART2D_BASEDIR)$(DIRSEP)thirdparty$(DIRSEP)freetype$(DIRSEP)lib ! </set> ! <set var="LUA_LIB_PATH"> ! $(WXART2D_BASEDIR)$(DIRSEP)thirdparty$(DIRSEP)wxLua$(DIRSEP)lib ! </set> ! ! ! <if cond="TARGETING_IDE=='1'"> ! ! <!-- IDEs are less flexible: we always need to include all paths --> ! <define-tag name="thirdparty-include-paths" rules="lib,dll,exe"> ! <include>$(AGG_INCLUDE_PATH)</include> ! <include>$(EXPAT_INCLUDE_PATH)</include> ! <include>$(FREETYPE_INCLUDE_PATH)</include> ! <include>$(LUA_INCLUDE_PATH)</include> ! </define-tag> ! <define-tag name="thirdparty-lib-paths" rules="lib,dll,exe"> ! <lib-path>$(AGG_LIB_PATH)</lib-path> ! <lib-path>$(EXPAT_LIB_PATH)</lib-path> ! <lib-path>$(FREETYPE_LIB_PATH)</lib-path> ! <lib-path>$(LUA_LIB_PATH)</lib-path> ! </define-tag> ! ! <!-- the following IFs contains weak conditions since WXART2D_USE_Xxxx are not options ! when working with IDEs, just simple variables... --> ! <define-tag name="a2d-req-libs" rules="lib,dll,exe"> ! <if cond="WXART2D_USE_AGG=='1'"><sys-lib>agg</sys-lib></if> ! <if cond="WXART2D_USE_FREETYPE=='1'"><sys-lib>freetype</sys-lib></if> ! <if cond="WXART2D_USE_EXPAT=='1'"><sys-lib>expat</sys-lib></if> ! <if cond="WXART2D_USE_LUA=='1'"><sys-lib>wxlua</sys-lib></if> ! </define-tag> </if> - <if cond="TARGETING_IDE=='0'"> - - <!-- we can include only the required paths --> - - <set var="THIRDPARTY_INCLUDE_PATH"> - <if cond="WXART2D_USE_AGG=='1'">$(INCLUDE_SWITCH)$(AGG_INCLUDE_PATH)</if> - </set> - <set var="THIRDPARTY_INCLUDE_PATH"> - <if cond="WXART2D_USE_EXPAT=='1'">$(THIRDPARTY_INCLUDE_PATH) $(INCLUDE_SWITCH)$(EXPAT_INCLUDE_PATH)</if> - </set> - <set var="THIRDPARTY_INCLUDE_PATH"> - <if cond="WXART2D_USE_FREETYPE=='1'">$(THIRDPARTY_INCLUDE_PATH) $(INCLUDE_SWITCH)$(FREETYPE_INCLUDE_PATH)</if> - </set> - <set var="THIRDPARTY_INCLUDE_PATH"> - <if cond="WXART2D_USE_LUA=='1'">$(THIRDPARTY_INCLUDE_PATH) $(INCLUDE_SWITCH)$(LUA_INCLUDE_PATH)</if> - </set> - - <set var="THIRDPARTY_LIB_PATH"> - <if cond="WXART2D_USE_AGG=='1'">$(LIBPATH_SWITCH)$(AGG_LIB_PATH)</if> - </set> - <set var="THIRDPARTY_LIB_PATH"> - <if cond="WXART2D_USE_EXPAT=='1'">$(THIRDPARTY_LIB_PATH) $(LIBPATH_SWITCH)$(EXPAT_LIB_PATH)</if> - </set> - <set var="THIRDPARTY_LIB_PATH"> - <if cond="WXART2D_USE_FREETYPE=='1'">$(THIRDPARTY_LIB_PATH) $(LIBPATH_SWITCH)$(FREETYPE_LIB_PATH)</if> - </set> - <set var="THIRDPARTY_LIB_PATH"> - <if cond="WXART2D_USE_LUA=='1'">$(THIRDPARTY_LIB_PATH) $(LIBPATH_SWITCH)$(LUA_LIB_PATH)</if> - </set> - - <set var="THIRDPARTY_AGG_LIB"> - <if cond="WXART2D_USE_AGG=='1'">agg</if> - </set> - <set var="THIRDPARTY_EXPAT_LIB"> - <if cond="WXART2D_USE_EXPAT=='1'">expat</if> - </set> - <set var="THIRDPARTY_FREETYPE_LIB"> - <if cond="WXART2D_USE_FREETYPE=='1'">freetype</if> - </set> - <set var="THIRDPARTY_WXLUA_LIB"> - <if cond="WXART2D_USE_LUA=='1'">wxlua</if> - </set> - - <define-tag name="thirdparty-include-paths" rules="lib,dll,exe"> - <cppflags>$(THIRDPARTY_INCLUDE_PATH)</cppflags> - </define-tag> - <define-tag name="thirdparty-lib-paths" rules="lib,dll,exe"> - <ldflags>$(THIRDPARTY_LIB_PATH)</ldflags> - </define-tag> - <define-tag name="a2d-req-libs" rules="lib,dll,exe"> - <sys-lib>$(THIRDPARTY_AGG_LIB)</sys-lib> - <sys-lib>$(THIRDPARTY_EXPAT_LIB)</sys-lib> - <sys-lib>$(THIRDPARTY_FREETYPE_LIB)</sys-lib> - <sys-lib>$(THIRDPARTY_WXLUA_LIB)</sys-lib> - </define-tag> - - </if> </makefile> --- 47,54 ---- 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_WXLUADEBUG">1</set> ! <set var="USE_WXLUASOCKET">1</set> </if> </makefile> |
