Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: Francesco <fr...@us...> - 2005-06-12 20:53:51
|
Update of /cvsroot/wxlua/wxLua/util/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4660/bakefiles Log Message: Directory /cvsroot/wxlua/wxLua/util/build/bakefiles added to the repository |
|
From: Francesco <fr...@us...> - 2005-06-12 20:53:43
|
Update of /cvsroot/wxlua/wxLua/util/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4487/build Log Message: Directory /cvsroot/wxlua/wxLua/util/build added to the repository |
|
From: Francesco <fr...@us...> - 2005-06-12 18:29:30
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25491/modules/build/bakefiles Added Files: .cvsignore Bakefiles.bkgen modules.bkl options.bkl regen.bat Log Message: Initial upload of bakefile build system --- NEW FILE: options.bkl --- <?xml version="1.0" ?> <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- RCS-ID: $Id: options.bkl,v 1.1 2005/06/12 18:29:20 frm Exp $ --> <!-- --> <!-- WXLUA OPTIONS BAKEFILE --> <!-- --> <makefile> <!-- --> <!-- 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> <!-- --> <!-- The list of wxLua OPTIONS --> <!-- --> <!-- 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 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="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> --- NEW FILE: regen.bat --- @echo off REM REM MAKEFILE REGENERATION SCRIPT (for WinXP) REM REM author: Francesco Montorsi (fr...@us...) REM RCS-ID: $Id: regen.bat,v 1.1 2005/06/12 18:29:20 frm Exp $ echo. echo. echo Regenerating makefiles... echo. bakefile_gen echo. echo Regeneration completed. echo. echo. pause --- NEW FILE: Bakefiles.bkgen --- <?xml version="1.0" ?> <!-- $Id: Bakefiles.bkgen,v 1.1 2005/06/12 18:29:20 frm Exp $ --> <bakefile-gen> <disable-formats>gnu,dmars,cbx_unix,cbuilderx</disable-formats> <input>modules.bkl</input> <!-- required since wxArt2d uses wx presets stored in wxWidgets subfolders... --> <add-flags>-I%WXWIN%\build\bakefiles\wxpresets</add-flags> <!-- List of output formats to generate: --> <add-formats> msvc<!--autoconf,borland,dmars,mingw,msvc,msvc6prj,watcom,cbuilderx,cbx_unix,gnu --> </add-formats> <!-- Directories where msw makefiles should go: --> <add-flags formats="borland"> -o../msw/makefile.bcc </add-flags> <add-flags formats="dmars_smake"> -o../msw/makefile.dms </add-flags> <add-flags formats="dmars"> -o../msw/makefile.dmc </add-flags> <add-flags formats="mingw"> -o../msw/makefile.gcc </add-flags> <add-flags formats="msvc"> -o../msw/makefile.vc </add-flags> <add-flags formats="watcom"> -o../msw/makefile.wat </add-flags> <add-flags formats="msvc6prj"> <!-- the name of the DSW must be lowercase otherwise output libname will be lowercase for some targets and for some others it will be mixed... --> -o../msw/modules.dsw </add-flags> <!-- Directory where AUTOCONF files should go: --> <add-flags formats="autoconf"> -o../../Makefile.in </add-flags> <add-flags formats="autoconf"> <!-- bakefile will merge the conditions required by our Makefile.in with the conditions required by the others Makefile.in files of the project; wonderful ! --> -DAUTOCONF_MACROS_FILE=../../../autoconf_inc.m4 </add-flags> </bakefile-gen> --- NEW FILE: modules.bkl --- <?xml version="1.0" ?> <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- RCS-ID: $Id: modules.bkl,v 1.1 2005/06/12 18:29:20 frm Exp $ --> <!-- --> <!-- WXLUA BAKEFILE --> <!-- --> <!-- The bakefile used to build all the modules. --> <!-- --> <makefile> <!-- This is a bakefile, that is, a generic template used to --> <!-- generate makefiles ALL supported compilers. --> <!-- To use this project file type something like: --> <!-- bakefile -fmsvc modules.bkl --> <!-- See http://bakefile.sourceforge.net for more info. --> <!-- This file contains the wxLua template --> <include file="../../../build/bakefiles/wxluabase.bkl"/> <!-- This one contains the lists of all source & header files --> <include file="sources.bkl"/> <!-- --> <!-- VARIABLES --> <!-- --> <!-- All the source files & header files linked above are relative to our base dir --> <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">..$(DIRSEP)..</set></if> <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if> <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)$(DIRSEP)..</set> <!-- 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> <!-- Creates the following custom build rule for MSVC6PRJ file: copies $(WXLUA_BASEDIR)\include\msw\$(value).h into $(WXLUA_BASEDIR)\include\$(value).h NOTE: this tag must be used before the <sources> tag if you want that the configuration file will be created before any other source file is compiled... --> <define-tag name="msvc-copy-setup-h" rules="dll,lib,action"> <if cond="FORMAT=='msvc6prj'"> <set var="__hfilename">$(value)</set> <set var="__hfile">$(value).h</set> <set var="__updir">..</set> <set var="__updir_underscored">__</set> <set var="__destdir">..\..\..</set> <headers>..\include\msw\$(__hfile)</headers> <set var="_custom_build_files" append="1">$(__updir)\include\msw\$(__hfile)</set> <set var="_custom_build_$(__updir_underscored)_include_msw_$(__hfilename)_h"> Creating the configuration file $(__updir)\include\$(__hfile) from $(__updir)\include\msw\$(__hfile) InputPath=$(__updir)\include\msw\$(__hfile) "$(__updir)\include\$(__hfile)" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" $(TAB)copy "$(DOLLAR)(InputPath)" $(__destdir)\include\$(__hfile) </set> </if> </define-tag> <!-- --> <!-- The list of wxLua OPTIONS --> <!-- --> <!-- third-party libs options --> <include file="../../../thirdparty/build/bakefiles/options.bkl"/> <!-- modules-specific options --> <include file="options.bkl"/> <!-- --> <!-- TEMPLATES --> <!-- --> <template id="a2d_lib" template="wxart2d-lib"> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> <thirdparty-include-paths/> <!-- IDEs are less flexible so we use a lot of wxART2D_USE_XXX defines and we avoid to use a art2dsetup.h file which we use instead for win32 command-line makefiles --> <if cond="TARGETING_IDE=='1'"> <ide-thirdparty-defines/> <ide-modules-defines/> </if> </template> <template id="a2d_dll" template="wxart2d"> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname> <!-- <cppflags>$(SHARED_DEFINES)</cppflags> --> <thirdparty-include-paths/> <thirdparty-lib-paths/> <!-- The DLL version --> <version>$(WXLUA_VERSION)</version> <so_version>$(WXLUA_SOVERSION)</so_version> <mac_version>$(WXLUA_MACVERSION)</mac_version> <!-- Libraries must be put in the right order ! --> <a2d-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> </template> <template id="a2d_sample" template="wxart2d"> <thirdparty-include-paths/> <thirdparty-lib-paths/> <!-- Libraries must be put in the right order ! --> <a2d-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> </template> <!-- --> <!-- NEW RULES --> <!-- with these ones, each module/sample target takes few lines only --> <!-- --> <define-rule name="a2d_lib" extends="lib"> <template> <set var="__modname"/> </template> <define-tag name="module-name"> <set var="__modname">$(value)</set> <set var="__modnamelow">$(__modname.lower())</set> <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set> <set var="__modsrc" append="1">$(mk.evalExpr('$(' + __modnamelow + '_specific_src)'))</set> <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set> <!-- <set var="__modhdr" append="1">$(mk.evalExpr('$(' + __modnamelow + '_specific_hdr)'))</set> --> <libname>$(__modnamelow)</libname> <sources>$(__modsrc)</sources> <headers>$(__modhdr)</headers> <!-- to make MSVC6PRJ output look better... --> <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group> <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> <if cond="FORMAT!='autoconf'"> <precomp-headers>on</precomp-headers> <precomp-headers-header>a2dprec</precomp-headers-header> <precomp-headers-file>a2dprec</precomp-headers-file> </if> </define-tag> </define-rule> <define-rule name="a2d_dll" extends="dll"> <template> <set var="__modname"/> </template> <define-tag name="module-name"> <set var="__modname">$(value)</set> <set var="__modnamelow">$(__modname.lower())</set> <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set> <set var="__modsrc" append="1">$(mk.evalExpr('$(' + __modnamelow + '_specific_src)'))</set> <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set> <!-- <set var="__modhdr" append="1">$(mk.evalExpr('$(' + __modnamelow + '_specific_hdr)'))</set> --> <libname>$(__modnamelow)</libname> <sources>$(__modsrc)</sources> <headers>$(__modhdr)</headers> <!-- to make MSVC6PRJ output look better... --> <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group> <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> <!-- now, shared stuff --> <define>A2D$(__modname)MAKINGDLL</define> </define-tag> </define-rule> <define-rule name="a2d_sample" extends="exe"> <template> <set var="__modowner"/> <set var="__sampname"/> </template> <define-tag name="name"> <set var="__sampname">$(value)</set> <exename>$(__sampname)</exename> <sources>$(__modowner)/samples/$(__sampname)/$(__sampname).cpp</sources> <headers>$(__modowner)/samples/$(__sampname)/$(__sampname).h</headers> <dirname>$(WXLUA_MODULEDIR)$(DIRSEP)$(__modowner)/samples/$(__sampname)</dirname> </define-tag> <define-tag name="module-dep"> <if cond="TARGETING_IDE=='1'"> <depends>$(value.lower())_lib</depends> </if> <a2d-lib>$(value.lower())</a2d-lib> </define-tag> <define-tag name="owner"> <set var="__modowner">$(value.lower())</set> <!-- we always depend both from our owner and from GENERAL modules --> <module-dep>$(value)</module-dep> <module-dep>GENERAL</module-dep> <!-- our name always matches the ID of this target... --> <if cond="FORMAT=='msvc6prj'"> <!-- except with MSVC6PRJ: in this case we need to make it begin with 'samp_' so to make easier for the user to recognize the sample projects and the module projects --> <name>$(id)</name> <set var="id">samp_$(__modowner)_$(id)</set> </if> <if cond="FORMAT!='msvc6prj'"> <name>$(id)</name> </if> </define-tag> <define-tag name="thirdyparty-dep"> </define-tag> </define-rule> <!-- --> <!-- 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> <!-- the file where all wxART2D_USE_XXXX defined symbols will be written --> <set var="SETUP_FILENAME">art2dsetup.h</set> <set var="SETUP_FILE">$(WXLUA_BASEDIR)$(DIRSEP)include$(DIRSEP)$(SETUP_FILENAME)</set> <!-- a little helper --> <set var="CMD_PREFIX">@</set> <!-- a little shortcut for the target below --> <define-tag name="setupdef" rules="action"> <!-- VERY IMPORTANT: we cannot use the '#' symbol in a makefile since it's interpreted as comment marker, even when quoted ! So, we cannot use echo or any other program to write #define commands; instead we write 'define wxART2D_USE_XXXXX 1/0' and then we add the '#' symbol using a batch file (which allows a safe use of '#' symbols). --> <command>$(CMD_PREFIX)echo define wxART2D_USE_$(value)$(TAB)$(mk.evalExpr('$(WXLUA_USE_' + value + ')')) >>$(SETUP_FILE)</command> </define-tag> <!-- when running this target, we are sure we are on win32 --> <action id="setup"> <dependency-of>all</dependency-of> <command>@$(RM) $(SETUP_FILE) >NUL</command> <!-- tell the user what we are doing --> <command>$(CMD_PREFIX)echo ==============================================================</command> <command>$(CMD_PREFIX)echo Writing the new $(SETUP_FILE) file...</command> <command>$(CMD_PREFIX)echo ==============================================================</command> <!-- write a small intro in the setup file --> <command>$(CMD_PREFIX)echo // $(SETUP_FILENAME) >>$(SETUP_FILE)</command> <command>$(CMD_PREFIX)echo // This is an automatically generated file... >>$(SETUP_FILE)</command> <command>$(CMD_PREFIX)echo // Do not modify; all changes will be overwritten ! >>$(SETUP_FILE)</command> <!-- now, dump our options values so all wxLua code can access them --> <setupdef>AGGDRAWER</setupdef> <setupdef>ARTBASE</setupdef> <setupdef>CANEXTOBJ</setupdef> <setupdef>CANVAS</setupdef> <setupdef>CURVES</setupdef> <setupdef>DOCVIEW</setupdef> <setupdef>EDITOR</setupdef> <setupdef>GDSIO</setupdef> <setupdef>KBOOL</setupdef> <setupdef>KEYIO</setupdef> <setupdef>LUAWRAPS</setupdef> <setupdef>STSL</setupdef> <setupdef>SVGIO</setupdef> <setupdef>XMLPARSE</setupdef> <!-- do not try to use echo to write empty lines: this is not safe & portable ! --> <command>$(CMD_PREFIX)echo // >>$(SETUP_FILE)</command> <command>$(CMD_PREFIX)echo // external dependencies... >>$(SETUP_FILE)</command> <setupdef>CVGIO</setupdef> <setupdef>FREETYPE</setupdef> <setupdef>EXPAT</setupdef> <setupdef>LUA</setupdef> <setupdef>AGG</setupdef> <!-- run this batch file to replace the 'define' strings with '#define' strings in the just written file --> <command>CALL makesetup.bat $(SETUP_FILENAME)</command> </action> </if> <!-- --> <!-- The list of wxLua MODULES --> <!-- --> <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir --> <set var="SRCDIR">$(WXLUA_MODULEDIR)</set> <wxlua_lib id="" template="a2d_lib" cond="WX_SHARED=='0' and WXLUA_USE_XMLPARSE=='1'"><module-name>XMLPARSE</module-name></a2d_lib> <wxlua_dll id="aggdrawer_dll" template="a2d_dll" cond="WX_SHARED=='1' and WXLUA_USE_AGGDRAWER=='1'"><module-name>AGGDRAWER</module-name></a2d_dll> <!-- since all the previous targets would generate each one a different DSP project (i.e. a lot of project files), we instead tell Bakefile to merge the LIBS & DLLS targets so to generate only half of the DSP files --> <!-- NOTE: we use 'mod_' as prefix so that when opening the DSW file, the user immediately gets a good idea about what is a MODULE and what is a SAMPLE (see the a2d_sample rule) --> <set var="MSVC6PRJ_MERGED_TARGETS"> mod_aggdrawer=aggdrawer_lib+aggdrawer_dll mod_artbase=artbase_lib+artbase_dll mod_canextobj=canextobj_lib+canextobj_dll mod_canvas=canvas_lib+canvas_dll mod_curves=curves_lib+curves_dll mod_docview=docview_lib+docview_dll mod_editor=editor_lib+editor_dll mod_gdsio=gdsio_lib+gdsio_dll mod_kbool=kbool_lib+kbool_dll mod_keyio=keyio_lib+keyio_dll mod_luawraps=luawraps_lib+luawraps_dll mod_stsl=stsl_lib+stsl_dll mod_svgio=svgio_lib+svgio_dll mod_xmlparse=xmlparse_lib+xmlparse_dll mod_general=general_lib+general_dll <!-- don't forget the GENERAL module --> </set> <!-- --> <!-- The list of wxLua SAMPLES --> <!-- --> <!-- AGGDRAWER samples --> <a2d_sample id="directdrawagg" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_AGGDRAWER=='1'"> <owner>AGGDRAWER</owner> <module-dep>XMLPARSE</module-dep> <module-dep>ARTBASE</module-dep> </a2d_sample> <a2d_sample id="tutoagg" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_AGGDRAWER=='1'"> <owner>AGGDRAWER</owner> <module-dep>ARTBASE</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>EDITOR</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <!-- ARTBASE samples --> <a2d_sample id="directdraw" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_ARTBASE=='1' and WXLUA_USE_XMLPARSE=='1'"> <owner>ARTBASE</owner> <module-dep>XMLPARSE</module-dep> </a2d_sample> <a2d_sample id="drawtest" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_ARTBASE=='1' and WXLUA_USE_AGGDRAWER=='1'"> <owner>ARTBASE</owner> <module-dep>XMLPARSE</module-dep> <module-dep>AGGDRAWER</module-dep> </a2d_sample> <!-- CANVAS samples --> <a2d_sample id="boolop" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_CANVAS=='1'"> <owner>CANVAS</owner> <module-dep>KBOOL</module-dep> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <a2d_sample id="canmdi" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_CANVAS=='1'"> <owner>CANVAS</owner> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <a2d_sample id="cansim" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_CANVAS=='1'"> <owner>CANVAS</owner> <module-dep>KBOOL</module-dep> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <a2d_sample id="simple" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_CANVAS=='1'"> <owner>CANVAS</owner> <module-dep>KBOOL</module-dep> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <a2d_sample id="split" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_CANVAS=='1'"> <owner>CANVAS</owner> <module-dep>KBOOL</module-dep> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <!-- CURVES samples --> <a2d_sample id="curtuto1" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_CURVES=='1'"> <owner>CURVES</owner> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>CANEXTOBJ</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>EDITOR</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <!-- DOCVIEW samples --> <define-tag name="docview-specific" rules="a2d_sample"> <include>$(WXLUA_MODULEDIR)/docview/samples/common</include> <sources>docview/samples/common/doc.cpp docview/samples/common/view.cpp docview/samples/common/docdialog.cpp</sources> <headers>docview/samples/common/doc.h docview/samples/common/view.h docview/samples/common/docdialog.h</headers> </define-tag> <a2d_sample id="mdi" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_DOCVIEW=='1'"> <owner>DOCVIEW</owner> <docview-specific/> <module-dep>ARTBASE</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> </a2d_sample> <a2d_sample id="multiframe" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_DOCVIEW=='1'"> <owner>DOCVIEW</owner> <docview-specific/> <module-dep>ARTBASE</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> </a2d_sample> <a2d_sample id="multiwin" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_DOCVIEW=='1'"> <owner>DOCVIEW</owner> <docview-specific/> <module-dep>ARTBASE</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> </a2d_sample> <a2d_sample id="nonmanaged" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_DOCVIEW=='1'"> <owner>DOCVIEW</owner> <docview-specific/> <module-dep>ARTBASE</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> </a2d_sample> <a2d_sample id="singleframe" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_DOCVIEW=='1'"> <owner>DOCVIEW</owner> <docview-specific/> <module-dep>ARTBASE</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> </a2d_sample> <a2d_sample id="splitwin" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_DOCVIEW=='1'"> <owner>DOCVIEW</owner> <docview-specific/> <module-dep>ARTBASE</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> </a2d_sample> <a2d_sample id="tabframe" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_DOCVIEW=='1'"> <owner>DOCVIEW</owner> <docview-specific/> <module-dep>ARTBASE</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> </a2d_sample> <!-- EDITOR samples --> <define-tag name="editor-specific" rules="a2d_sample"> <include>$(WXLUA_MODULEDIR)/editor/samples/common</include> <sources>editor/samples/common/screen.cpp</sources> <headers>editor/samples/common/screen.h</headers> </define-tag> <a2d_sample id="editmdi" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>CANEXTOBJ</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <a2d_sample id="single" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>SVGIO</module-dep> <module-dep>CANEXTOBJ</module-dep> </a2d_sample> <a2d_sample id="single2" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>SVGIO</module-dep> <module-dep>CANEXTOBJ</module-dep> </a2d_sample> <a2d_sample id="tuto" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <!-- <editor-specific/> DO NOT INCLUDE THIS - NOT REQUIRED BY THIS SAMPLE --> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>SVGIO</module-dep> <module-dep>CANEXTOBJ</module-dep> </a2d_sample> <a2d_sample id="tuto3" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>SVGIO</module-dep> <module-dep>CANEXTOBJ</module-dep> </a2d_sample> <a2d_sample id="tuto4" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>SVGIO</module-dep> <module-dep>CANEXTOBJ</module-dep> <module-dep>CURVES</module-dep> </a2d_sample> <a2d_sample id="vdrawm" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <sources>editor/samples/vdrawm/view.cpp</sources> <headers>editor/samples/vdrawm/view.h</headers> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>CANEXTOBJ</module-dep> <module-dep>SVGIO</module-dep> <module-dep>GDSIO</module-dep> <module-dep>AGGDRAWER</module-dep> </a2d_sample> <a2d_sample id="vdraws" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>CANEXTOBJ</module-dep> <module-dep>SVGIO</module-dep> <module-dep>GDSIO</module-dep> <module-dep>AGGDRAWER</module-dep> </a2d_sample> <a2d_sample id="viewmul" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <sources>editor/samples/viewmul/doc.cpp</sources> <headers>editor/samples/viewmul/doc.h</headers> <sources>editor/samples/viewmul/docv.cpp</sources> <headers>editor/samples/viewmul/docv.h</headers> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>CANEXTOBJ</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <a2d_sample id="wires" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <sources>editor/samples/wires/elements.cpp</sources> <headers>editor/samples/wires/elements.h</headers> <module-dep>ARTBASE</module-dep> <module-dep>CURVES</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>CANEXTOBJ</module-dep> <module-dep>SVGIO</module-dep> </a2d_sample> <a2d_sample id="zoom" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_EDITOR=='1'"> <owner>EDITOR</owner> <editor-specific/> <module-dep>CURVES</module-dep> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANEXTOBJ</module-dep> <module-dep>SVGIO</module-dep> <module-dep>CANVAS</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>XMLPARSE</module-dep> </a2d_sample> <!-- KBOOL samples --> <a2d_sample id="boolonly" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_KBOOL=='1'"> <owner>KBOOL</owner> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> </a2d_sample> <!-- STSL samples --> <a2d_sample id="stslcom" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_STSL=='1'"> <owner>STSL</owner> <sources>stsl/samples/stslcom/tedit.cpp</sources> <headers>stsl/samples/stslcom/tedit.h</headers> <sources>stsl/samples/stslcom/docv.cpp</sources> <headers>stsl/samples/stslcom/docv.h</headers> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> <module-dep>EDITOR</module-dep> <module-dep>SVGIO</module-dep> <module-dep>CANEXTOBJ</module-dep> </a2d_sample> <a2d_sample id="stsltuto" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_STSL=='1'"> <owner>STSL</owner> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> </a2d_sample> <a2d_sample id="stsltuto2" template="a2d_sample" cond="SAMPLES=='1' and WXLUA_USE_STSL=='1'"> <owner>STSL</owner> <module-dep>ARTBASE</module-dep> <module-dep>DOCVIEW</module-dep> <module-dep>CANVAS</module-dep> <module-dep>XMLPARSE</module-dep> </a2d_sample> </makefile> --- NEW FILE: .cvsignore --- *.state |
|
From: Francesco <fr...@us...> - 2005-06-12 18:29:29
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25491/build/msw Added Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Initial upload of bakefile build system --- NEW FILE: makefile.vc --- # ========================================================================= # This makefile was generated by # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= # ------------------------------------------------------------------------- # These are configurable options: # ------------------------------------------------------------------------- # C compiler CC = cl # C++ compiler CXX = cl # Standard flags for CC CFLAGS = # Standard flags for C++ CXXFLAGS = # Standard preprocessor flags (common for CC and CXX) CPPFLAGS = # Standard linker flags LDFLAGS = # The directory where wxWidgets library is installed WX_DIR = $(WXWIN) # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] WX_DEBUG = 1 # Version of the wx library to build against. WX_VERSION = 26 # Does the FREETYPE support need to be compiled ? [0,1] WXART2D_USE_FREETYPE = 1 # Does the EXPAT support need to be compiled ? [0,1] WXART2D_USE_EXPAT = 1 # Does the LUA support need to be compiled ? [0,1] WXART2D_USE_LUA = 0 # Does the AGG support need to be compiled ? [0,1] WXART2D_USE_AGG = 1 # Does the samples need to be compiled ? [0,1] SAMPLES = 1 # Does the CVG support need to be compiled ? [0,1] WXART2D_USE_CVGIO = 1 # Does AGGDRAWER module need to be compiled ? [0,1] WXART2D_USE_AGGDRAWER = 1 # Does ARTBAES module need to be compiled ? [0,1] WXART2D_USE_ARTBASE = 1 # Does CANEXTOBJ module need to be compiled ? [0,1] WXART2D_USE_CANEXTOBJ = 1 # Does CANVAS module need to be compiled ? [0,1] WXART2D_USE_CANVAS = 1 # Does CURVES module need to be compiled ? [0,1] WXART2D_USE_CURVES = 1 # Does DOCVIEW module need to be compiled ? [0,1] WXART2D_USE_DOCVIEW = 1 # Does EDITOR module need to be compiled ? [0,1] WXART2D_USE_EDITOR = 1 # Does GDSIO module need to be compiled ? [0,1] WXART2D_USE_GDSIO = 1 # Does KBOOL module need to be compiled ? [0,1] WXART2D_USE_KBOOL = 1 # Does KEYIO module need to be compiled ? [0,1] WXART2D_USE_KEYIO = 1 # Does LUAWRAPS module need to be compiled ? [0,1] WXART2D_USE_LUAWRAPS = 0 # Does STSL module need to be compiled ? [0,1] WXART2D_USE_STSL = 1 # Does SVGIO module need to be compiled ? [0,1] WXART2D_USE_SVGIO = 1 # Does XMLPARSE module need to be compiled ? [0,1] WXART2D_USE_XMLPARSE = 1 # Does the Mars application needs to be compiled ? [0,1] MARS = 1 # Does the Teto application needs to be compiled ? [0,1] TETO = 1 # ------------------------------------------------------------------------- # Do not modify the rest of this file! # ------------------------------------------------------------------------- ### Variables: ### 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)" WXART2D_USE_FREETYPE="$(WXART2D_USE_FREETYPE)" \ WXART2D_USE_EXPAT="$(WXART2D_USE_EXPAT)" \ WXART2D_USE_LUA="$(WXART2D_USE_LUA)" WXART2D_USE_AGG="$(WXART2D_USE_AGG)" \ BUILD="$(BUILD_EQUIVALENT)" SAMPLES="$(SAMPLES)" \ WXART2D_USE_CVGIO="$(WXART2D_USE_CVGIO)" \ WXART2D_USE_AGGDRAWER="$(WXART2D_USE_AGGDRAWER)" \ WXART2D_USE_ARTBASE="$(WXART2D_USE_ARTBASE)" \ WXART2D_USE_CANEXTOBJ="$(WXART2D_USE_CANEXTOBJ)" \ WXART2D_USE_CANVAS="$(WXART2D_USE_CANVAS)" \ WXART2D_USE_CURVES="$(WXART2D_USE_CURVES)" \ WXART2D_USE_DOCVIEW="$(WXART2D_USE_DOCVIEW)" \ WXART2D_USE_EDITOR="$(WXART2D_USE_EDITOR)" \ WXART2D_USE_GDSIO="$(WXART2D_USE_GDSIO)" \ WXART2D_USE_KBOOL="$(WXART2D_USE_KBOOL)" \ WXART2D_USE_KEYIO="$(WXART2D_USE_KEYIO)" \ WXART2D_USE_LUAWRAPS="$(WXART2D_USE_LUAWRAPS)" \ WXART2D_USE_STSL="$(WXART2D_USE_STSL)" \ WXART2D_USE_SVGIO="$(WXART2D_USE_SVGIO)" \ WXART2D_USE_XMLPARSE="$(WXART2D_USE_XMLPARSE)" MARS="$(MARS)" \ TETO="$(TETO)" ### Conditionally set variables: ### !if "$(WXART2D_USE_AGGDRAWER)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = /DA2DAGGDRAWERMAKINGDLL !endif !if "$(WXART2D_USE_ARTBASE)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DARTBASEMAKINGDLL !endif !if "$(WXART2D_USE_CANEXTOBJ)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DCANEXTOBJMAKINGDLL !endif !if "$(WXART2D_USE_CANVAS)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DCANVASMAKINGDLL !endif !if "$(WXART2D_USE_CURVES)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DCURVESMAKINGDLL !endif !if "$(WXART2D_USE_DOCVIEW)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DDOCVIEWMAKINGDLL !endif !if "$(WXART2D_USE_EDITOR)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DEDITORMAKINGDLL !endif !if "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DGENERALMAKINGDLL !endif !if "$(WXART2D_USE_GDSIO)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DGDSIOMAKINGDLL !endif !if "$(WXART2D_USE_KBOOL)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DKBOOLMAKINGDLL !endif !if "$(WXART2D_USE_KEYIO)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DKEYIOMAKINGDLL !endif !if "$(WXART2D_USE_LUAWRAPS)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DLUAWRAPSMAKINGDLL !endif !if "$(WXART2D_USE_STSL)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DSTSLMAKINGDLL !endif !if "$(WXART2D_USE_SVGIO)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DSVGIOMAKINGDLL !endif !if "$(WXART2D_USE_XMLPARSE)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) /DA2DXMLPARSEMAKINGDLL !endif !if "$(WXART2D_USE_AGG)" == "1" THIRDPARTY_INCLUDE_PATH = /I..\..\thirdparty\agg2\include !endif !if "$(WXART2D_USE_EXPAT)" == "1" THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \ /I..\..\thirdparty\expat\include !endif !if "$(WXART2D_USE_FREETYPE)" == "1" THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \ /I..\..\thirdparty\freetype\include !endif !if "$(WXART2D_USE_LUA)" == "1" THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \ /I..\..\thirdparty\wxLua\include !endif !if "$(WXART2D_USE_AGG)" == "1" THIRDPARTY_LIB_PATH = /LIBPATH:..\..\thirdparty\agg2\lib !endif !if "$(WXART2D_USE_EXPAT)" == "1" THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) \ /LIBPATH:..\..\thirdparty\expat\lib !endif !if "$(WXART2D_USE_FREETYPE)" == "1" THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) \ /LIBPATH:..\..\thirdparty\freetype\lib !endif !if "$(WXART2D_USE_LUA)" == "1" THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) \ /LIBPATH:..\..\thirdparty\wxLua\lib !endif !if "$(WX_DEBUG)" == "1" BUILD_EQUIVALENT = debug !endif !if "$(WX_DEBUG)" == "1" BUILD_EQUIVALENT = release !endif ### Targets: ### all: sub_thirdyparty sub_modules sub_apps clean: -if exist .\*.obj del .\*.obj -if exist .\*.res del .\*.res -if exist .\*.pch del .\*.pch cd ..\..\thirdparty\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) sub_thirdyparty: cd ..\..\thirdparty\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) sub_modules: cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) sub_apps: cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) docs: @echo ============================================= @echo Creating wxArt2d docs using doxygen... @echo ============================================= cd ..\..\doc doxygen doxygen.inc --- NEW FILE: makefile.bcc --- # ========================================================================= # This makefile was generated by # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= .autodepend !ifndef BCCDIR !ifndef MAKEDIR !error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 !endif BCCDIR = $(MAKEDIR)\.. !endif # ------------------------------------------------------------------------- # These are configurable options: # ------------------------------------------------------------------------- # C compiler !ifndef CC CC = bcc32 !endif # C++ compiler !ifndef CXX CXX = bcc32 !endif # Standard flags for CC !ifndef CFLAGS CFLAGS = !endif # Standard flags for C++ !ifndef CXXFLAGS CXXFLAGS = !endif # Standard preprocessor flags (common for CC and CXX) !ifndef CPPFLAGS CPPFLAGS = -a8 -g0 !endif # Standard linker flags !ifndef LDFLAGS LDFLAGS = !endif # The directory where wxWidgets library is installed !ifndef WX_DIR WX_DIR = $(WXWIN) !endif # Use DLL build of wx library to use? [0,1] !ifndef WX_SHARED WX_SHARED = 0 !endif # Compile Unicode build of wxWidgets? [0,1] !ifndef WX_UNICODE WX_UNICODE = 0 !endif # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] !ifndef WX_DEBUG WX_DEBUG = 1 !endif # Version of the wx library to build against. !ifndef WX_VERSION WX_VERSION = 26 !endif # Does the FREETYPE support need to be compiled ? [0,1] !ifndef WXART2D_USE_FREETYPE WXART2D_USE_FREETYPE = 1 !endif # Does the EXPAT support need to be compiled ? [0,1] !ifndef WXART2D_USE_EXPAT WXART2D_USE_EXPAT = 1 !endif # Does the LUA support need to be compiled ? [0,1] !ifndef WXART2D_USE_LUA WXART2D_USE_LUA = 0 !endif # Does the AGG support need to be compiled ? [0,1] !ifndef WXART2D_USE_AGG WXART2D_USE_AGG = 1 !endif # Does the samples need to be compiled ? [0,1] !ifndef SAMPLES SAMPLES = 1 !endif # Does the CVG support need to be compiled ? [0,1] !ifndef WXART2D_USE_CVGIO WXART2D_USE_CVGIO = 1 !endif # Does AGGDRAWER module need to be compiled ? [0,1] !ifndef WXART2D_USE_AGGDRAWER WXART2D_USE_AGGDRAWER = 1 !endif # Does ARTBAES module need to be compiled ? [0,1] !ifndef WXART2D_USE_ARTBASE WXART2D_USE_ARTBASE = 1 !endif # Does CANEXTOBJ module need to be compiled ? [0,1] !ifndef WXART2D_USE_CANEXTOBJ WXART2D_USE_CANEXTOBJ = 1 !endif # Does CANVAS module need to be compiled ? [0,1] !ifndef WXART2D_USE_CANVAS WXART2D_USE_CANVAS = 1 !endif # Does CURVES module need to be compiled ? [0,1] !ifndef WXART2D_USE_CURVES WXART2D_USE_CURVES = 1 !endif # Does DOCVIEW module need to be compiled ? [0,1] !ifndef WXART2D_USE_DOCVIEW WXART2D_USE_DOCVIEW = 1 !endif # Does EDITOR module need to be compiled ? [0,1] !ifndef WXART2D_USE_EDITOR WXART2D_USE_EDITOR = 1 !endif # Does GDSIO module need to be compiled ? [0,1] !ifndef WXART2D_USE_GDSIO WXART2D_USE_GDSIO = 1 !endif # Does KBOOL module need to be compiled ? [0,1] !ifndef WXART2D_USE_KBOOL WXART2D_USE_KBOOL = 1 !endif # Does KEYIO module need to be compiled ? [0,1] !ifndef WXART2D_USE_KEYIO WXART2D_USE_KEYIO = 1 !endif # Does LUAWRAPS module need to be compiled ? [0,1] !ifndef WXART2D_USE_LUAWRAPS WXART2D_USE_LUAWRAPS = 0 !endif # Does STSL module need to be compiled ? [0,1] !ifndef WXART2D_USE_STSL WXART2D_USE_STSL = 1 !endif # Does SVGIO module need to be compiled ? [0,1] !ifndef WXART2D_USE_SVGIO WXART2D_USE_SVGIO = 1 !endif # Does XMLPARSE module need to be compiled ? [0,1] !ifndef WXART2D_USE_XMLPARSE WXART2D_USE_XMLPARSE = 1 !endif # Does the Mars application needs to be compiled ? [0,1] !ifndef MARS MARS = 1 !endif # Does the Teto application needs to be compiled ? [0,1] !ifndef TETO TETO = 1 !endif # ------------------------------------------------------------------------- # Do not modify the rest of this file! # ------------------------------------------------------------------------- ### Variables: ### MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ -DWX_VERSION="$(WX_VERSION)" \ -DWXART2D_USE_FREETYPE="$(WXART2D_USE_FREETYPE)" \ -DWXART2D_USE_EXPAT="$(WXART2D_USE_EXPAT)" \ -DWXART2D_USE_LUA="$(WXART2D_USE_LUA)" \ -DWXART2D_USE_AGG="$(WXART2D_USE_AGG)" -DBUILD="$(BUILD_EQUIVALENT)" \ -DSAMPLES="$(SAMPLES)" -DWXART2D_USE_CVGIO="$(WXART2D_USE_CVGIO)" \ -DWXART2D_USE_AGGDRAWER="$(WXART2D_USE_AGGDRAWER)" \ -DWXART2D_USE_ARTBASE="$(WXART2D_USE_ARTBASE)" \ -DWXART2D_USE_CANEXTOBJ="$(WXART2D_USE_CANEXTOBJ)" \ -DWXART2D_USE_CANVAS="$(WXART2D_USE_CANVAS)" \ -DWXART2D_USE_CURVES="$(WXART2D_USE_CURVES)" \ -DWXART2D_USE_DOCVIEW="$(WXART2D_USE_DOCVIEW)" \ -DWXART2D_USE_EDITOR="$(WXART2D_USE_EDITOR)" \ -DWXART2D_USE_GDSIO="$(WXART2D_USE_GDSIO)" \ -DWXART2D_USE_KBOOL="$(WXART2D_USE_KBOOL)" \ -DWXART2D_USE_KEYIO="$(WXART2D_USE_KEYIO)" \ -DWXART2D_USE_LUAWRAPS="$(WXART2D_USE_LUAWRAPS)" \ -DWXART2D_USE_STSL="$(WXART2D_USE_STSL)" \ -DWXART2D_USE_SVGIO="$(WXART2D_USE_SVGIO)" \ -DWXART2D_USE_XMLPARSE="$(WXART2D_USE_XMLPARSE)" -DMARS="$(MARS)" \ -DTETO="$(TETO)" ### Conditionally set variables: ### !if "$(WXART2D_USE_AGGDRAWER)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = -DA2DAGGDRAWERMAKINGDLL !endif !if "$(WXART2D_USE_ARTBASE)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DARTBASEMAKINGDLL !endif !if "$(WXART2D_USE_CANEXTOBJ)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCANEXTOBJMAKINGDLL !endif !if "$(WXART2D_USE_CANVAS)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCANVASMAKINGDLL !endif !if "$(WXART2D_USE_CURVES)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCURVESMAKINGDLL !endif !if "$(WXART2D_USE_DOCVIEW)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DDOCVIEWMAKINGDLL !endif !if "$(WXART2D_USE_EDITOR)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DEDITORMAKINGDLL !endif !if "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DGENERALMAKINGDLL !endif !if "$(WXART2D_USE_GDSIO)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DGDSIOMAKINGDLL !endif !if "$(WXART2D_USE_KBOOL)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DKBOOLMAKINGDLL !endif !if "$(WXART2D_USE_KEYIO)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DKEYIOMAKINGDLL !endif !if "$(WXART2D_USE_LUAWRAPS)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DLUAWRAPSMAKINGDLL !endif !if "$(WXART2D_USE_STSL)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DSTSLMAKINGDLL !endif !if "$(WXART2D_USE_SVGIO)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DSVGIOMAKINGDLL !endif !if "$(WXART2D_USE_XMLPARSE)" == "1" && "$(WX_SHARED)" == "1" SHARED_DEFINES = $(SHARED_DEFINES) -DA2DXMLPARSEMAKINGDLL !endif !if "$(WXART2D_USE_AGG)" == "1" THIRDPARTY_INCLUDE_PATH = -I..\..\thirdparty\agg2\include !endif !if "$(WXART2D_USE_EXPAT)" == "1" THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \ -I..\..\thirdparty\expat\include !endif !if "$(WXART2D_USE_FREETYPE)" == "1" THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \ -I..\..\thirdparty\freetype\include !endif !if "$(WXART2D_USE_LUA)" == "1" THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \ -I..\..\thirdparty\wxLua\include !endif !if "$(WXART2D_USE_AGG)" == "1" THIRDPARTY_LIB_PATH = -L..\..\thirdparty\agg2\lib !endif !if "$(WXART2D_USE_EXPAT)" == "1" THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\expat\lib !endif !if "$(WXART2D_USE_FREETYPE)" == "1" THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\freetype\lib !endif !if "$(WXART2D_USE_LUA)" == "1" THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\wxLua\lib !endif !if "$(WX_DEBUG)" == "1" BUILD_EQUIVALENT = debug !endif !if "$(WX_DEBUG)" == "1" BUILD_EQUIVALENT = release !endif ### Targets: ### all: thirdyparty modules apps clean: -if exist .\*.obj del .\*.obj -if exist .\*.res del .\*.res -if exist .\*.csm del .\*.csm @echo cd ..\..\thirdparty\build\msw >thirdyparty.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>thirdyparty.bat call thirdyparty.bat @del thirdyparty.bat @echo cd ..\..\modules\build\msw >modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>modules.bat call modules.bat @del modules.bat @echo cd ..\..\apps\build\msw >apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>apps.bat call apps.bat @del apps.bat thirdyparty: @echo cd ..\..\thirdparty\build\msw >thirdyparty.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>thirdyparty.bat call thirdyparty.bat @del thirdyparty.bat modules: @echo cd ..\..\modules\build\msw >modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>modules.bat call modules.bat @del modules.bat apps: @echo cd ..\..\apps\build\msw >apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>apps.bat call apps.bat @del apps.bat docs: @echo ============================================= @echo Creating wxArt2d docs using doxygen... @echo ============================================= cd ..\..\doc doxygen doxygen.inc --- NEW FILE: makefile.wat --- # ========================================================================= # This makefile was generated by # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= # ------------------------------------------------------------------------- # These are configurable options: # ------------------------------------------------------------------------- # C compiler CC = wcc386 # C++ compiler CXX = wpp386 # Standard flags for CC CFLAGS = # Standard flags for C++ CXXFLAGS = # Standard preprocessor flags (common for CC and CXX) CPPFLAGS = # Standard linker flags LDFLAGS = # The directory where wxWidgets library is installed WX_DIR = $(%WXWIN) # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] WX_DEBUG = 1 # Version of the wx library to build against. WX_VERSION = 26 # Does the FREETYPE support need to be compiled ? [0,1] WXART2D_USE_FREETYPE = 1 # Does the EXPAT support need to be compiled ? [0,1] WXART2D_USE_EXPAT = 1 # Does the LUA support need to be compiled ? [0,1] WXART2D_USE_LUA = 0 # Does the AGG support need to be compiled ? [0,1] WXART2D_USE_AGG = 1 # Does the samples need to be compiled ? [0,1] SAMPLES = 1 # Does the CVG support need to be compiled ? [0,1] WXART2D_USE_CVGIO = 1 # Does AGGDRAWER module need to be compiled ? [0,1] WXART2D_USE_AGGDRAWER = 1 # Does ARTBAES module need to be compiled ? [0,1] WXART2D_USE_ARTBASE = 1 # Does CANEXTOBJ module need to be compiled ? [0,1] WXART2D_USE_CANEXTOBJ = 1 # Does CANVAS module need to be compiled ? [0,1] WXART2D_USE_CANVAS = 1 # Does CURVES module need to be compiled ? [0,1] WXART2D_USE_CURVES = 1 # Does DOCVIEW module need to be compiled ? [0,1] WXART2D_USE_DOCVIEW = 1 # Does EDITOR module need to be compiled ? [0,1] WXART2D_USE_EDITOR = 1 # Does GDSIO module need to be compiled ? [0,1] WXART2D_USE_GDSIO = 1 # Does KBOOL module need to be compiled ? [0,1] WXART2D_USE_KBOOL = 1 # Does KEYIO module need to be compiled ? [0,1] WXART2D_USE_KEYIO = 1 # Does LUAWRAPS module need to be compiled ? [0,1] WXART2D_USE_LUAWRAPS = 0 # Does STSL module need to be compiled ? [0,1] WXART2D_USE_STSL = 1 # Does SVGIO module need to be compiled ? [0,1] WXART2D_USE_SVGIO = 1 # Does XMLPARSE module need to be compiled ? [0,1] WXART2D_USE_XMLPARSE = 1 # Does the Mars application needs to be compiled ? [0,1] MARS = 1 # Does the Teto application needs to be compiled ? [0,1] TETO = 1 # ------------------------------------------------------------------------- # Do not modify the rest of this file! # ------------------------------------------------------------------------- # Speed up compilation a bit: !ifdef __LOADDLL__ ! loaddll wcc wccd ! loaddll wccaxp wccdaxp ! loaddll wcc386 wccd386 ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 ! loaddll wlink wlink ! loaddll wlib wlibd !endif # We need these variables in some bakefile-made rules: WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- ### Conditionally set variables: ### SHARED_DEFINES = !ifeq WXART2D_USE_AGGDRAWER 1 !ifeq WX_SHARED 1 SHARED_DEFINES = -dA2DAGGDRAWERMAKINGDLL !endif !endif !ifeq WXART2D_USE_ARTBASE 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DARTBASEMAKINGDLL !endif !endif !ifeq WXART2D_USE_CANEXTOBJ 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DCANEXTOBJMAKINGDLL !endif !endif !ifeq WXART2D_USE_CANVAS 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DCANVASMAKINGDLL !endif !endif !ifeq WXART2D_USE_CURVES 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DCURVESMAKINGDLL !endif !endif !ifeq WXART2D_USE_DOCVIEW 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DDOCVIEWMAKINGDLL !endif !endif !ifeq WXART2D_USE_EDITOR 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DEDITORMAKINGDLL !endif !endif !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DGENERALMAKINGDLL !endif !ifeq WXART2D_USE_GDSIO 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DGDSIOMAKINGDLL !endif !endif !ifeq WXART2D_USE_KBOOL 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DKBOOLMAKINGDLL !endif !endif !ifeq WXART2D_USE_KEYIO 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DKEYIOMAKINGDLL !endif !endif !ifeq WXART2D_USE_LUAWRAPS 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DLUAWRAPSMAKINGDLL !endif !endif !ifeq WXART2D_USE_STSL 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DSTSLMAKINGDLL !endif !endif !ifeq WXART2D_USE_SVGIO 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DSVGIOMAKINGDLL !endif !endif !ifeq WXART2D_USE_XMLPARSE 1 !ifeq WX_SHARED 1 SHARED_DEFINES = $(SHARED_DEFINES) -dA2DXMLPARSEMAKINGDLL !endif !endif THIRDPARTY_INCLUDE_PATH = !ifeq WXART2D_USE_AGG 1 THIRDPARTY_INCLUDE_PATH = -i=..\..\thirdparty\agg2\include !endif !ifeq WXART2D_USE_EXPAT 1 THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) & -i=..\..\thirdparty\expat\include !endif !ifeq WXART2D_USE_FREETYPE 1 THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) & -i=..\..\thirdparty\freetype\include !endif !ifeq WXART2D_USE_LUA 1 THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) & -i=..\..\thirdparty\wxLua\include !endif THIRDPARTY_LIB_PATH = !ifeq WXART2D_USE_AGG 1 THIRDPARTY_LIB_PATH = libpath ..\..\thirdparty\agg2\lib !endif !ifeq WXART2D_USE_EXPAT 1 THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) libpath & ..\..\thirdparty\expat\lib !endif !ifeq WXART2D_USE_FREETYPE 1 THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) libpath & ..\..\thirdparty\freetype\lib !endif !ifeq WXART2D_USE_LUA 1 THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) libpath & ..\..\thirdparty\wxLua\lib !endif BUILD_EQUIVALENT = !ifeq WX_DEBUG 1 BUILD_EQUIVALENT = debug !endif !ifeq WX_DEBUG 1 BUILD_EQUIVALENT = release !endif ### Variables: ### 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)" WXART2D_USE_FREETYPE="$(WXART2D_USE_FREETYPE)" & WXART2D_USE_EXPAT="$(WXART2D_USE_EXPAT)" & WXART2D_USE_LUA="$(WXART2D_USE_LUA)" WXART2D_USE_AGG="$(WXART2D_USE_AGG)" & BUILD="$(BUILD_EQUIVALENT)" SAMPLES="$(SAMPLES)" & WXART2D_USE_CVGIO="$(WXART2D_USE_CVGIO)" & WXART2D_USE_AGGDRAWER="$(WXART2D_USE_AGGDRAWER)" & WXART2D_USE_ARTBASE="$(WXART2D_USE_ARTBASE)" & WXART2D_USE_CANEXTOBJ="$(WXART2D_USE_CANEXTOBJ)" & WXART2D_USE_CANVAS="$(WXART2D_USE_CANVAS)" & WXART2D_USE_CURVES="$(WXART2D_USE_CURVES)" & WXART2D_USE_DOCVIEW="$(WXART2D_USE_DOCVIEW)" & WXART2D_USE_EDITOR="$(WXART2D_USE_EDITOR)" & WXART2D_USE_GDSIO="$(WXART2D_USE_GDSIO)" & WXART2D_USE_KBOOL="$(WXART2D_USE_KBOOL)" & WXART2D_USE_KEYIO="$(WXART2D_USE_KEYIO)" & WXART2D_USE_LUAWRAPS="$(WXART2D_USE_LUAWRAPS)" & WXART2D_USE_STSL="$(WXART2D_USE_STSL)" & WXART2D_USE_SVGIO="$(WXART2D_USE_SVGIO)" & WXART2D_USE_XMLPARSE="$(WXART2D_USE_XMLPARSE)" MARS="$(MARS)" & TETO="$(TETO)" ### Targets: ### all : .SYMBOLIC thirdyparty modules apps clean : .SYMBOLIC -if exist .\*.obj del .\*.obj -if exist .\*.res del .\*.res -if exist .\*.lbc del .\*.lbc -if exist .\*.ilk del .\*.ilk -if exist .\*.pch del .\*.pch cd ..\..\thirdparty\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) cd ..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) thirdyparty : .SYMBOLIC cd ..\..\thirdparty\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) modules : .SYMBOLIC cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) apps : .SYMBOLIC cd ..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) docs : @echo ============================================= @echo Creating wxArt2d docs using doxygen... @echo ============================================= cd ..\..\doc doxygen doxygen.inc --- NEW FILE: makefile.gcc --- # ========================================================================= # This makefile was generated by # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= # ------------------------------------------------------------------------- # These are configurable options: # ------------------------------------------------------------------------- # C compiler CC = gcc # C++ compiler CXX = g++ # Standard flags for CC CFLAGS = # Standard flags for C++ CXXFLAGS = # Standard preprocessor flags (common for CC and CXX) CPPFLAGS = # Standard linker flags LDFLAGS = # The directory where wxWidgets library is installed WX_DIR = $(WXWIN) # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] WX_DEBUG = 1 # Version of the wx library to build against. WX_VERSION = 26 # Does the FREETYPE support need to be compiled ? [0,1] WXART2D_USE_FREETYPE = 1 # Does the EXPAT support need to be compiled ? [0,1] WXART2D_USE_EXPAT = 1 # Does the LUA support need to be compiled ? [0,1] WXART2D_USE_LUA = 0 # Does the AGG support need to be compiled ? [0,1] WXART2D_USE_AGG = 1 # Does the samples need to be compiled ? [0,1] SAMPLES = 1 # Does the CVG support need to be compiled ? [0,1] WXART2D_USE_CVGIO = 1 # Does AGGDRAWER module need to be compiled ? [0,1] WXART2D_USE_AGGDRAWER = 1 # Does ARTBAES module need to be compiled ? [0,1] WXART2D_USE_ARTBASE = 1 # Does CANEXTOBJ module need to be compiled ? [0,1] WXART2D_USE_CANEXTOBJ = 1 # Does CANVAS module need to be compiled ? [0,1] WXART2D_USE_CANVAS = 1 # Does CURVES module need to be compiled ? [0,1] WXART2D_USE_CURVES = 1 # Does DOCVIEW module need to be compiled ? [0,1] WXART2D_USE_DOCVIEW = 1 # Does EDITOR module need to be compiled ? [0,1] WXART2D_USE_EDITOR = 1 # Does GDSIO module need to be compiled ? [0,1] WXART2D_USE_GDSIO = 1 # Does KBOOL module need to be compiled ? [0,1] WXART2D_USE_KBOOL = 1 # Does KEYIO module need to be compiled ? [0,1] WXART2D_USE_KEYIO = 1 # Does LUAWRAPS module need to be compiled ? [0,1] WXART2D_USE_LUAWRAPS = 0 # Does STSL module need to be compiled ? [0,1] WXART2D_USE_STSL = 1 # Does SVGIO module need to be compiled ? [0,1] WXART2D_USE_SVGIO = 1 # Does XMLPARSE module need to be compiled ? [0,1] WXART2D_USE_XMLPARSE = 1 # Does the Mars application needs to be compiled ? [0,1] MARS = 1 # Does the Teto application needs to be compiled ? [0,1] TETO = 1 # ------------------------------------------------------------------------- # Do not modify the rest of this file! # ------------------------------------------------------------------------- ### Variables: ### 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)" WXART2D_USE_FREETYPE="$(WXART2D_USE_FREETYPE)" \ WXART2D_USE_EXPAT="$(WXART2D_USE_EXPAT)" \ WXART2D_USE_LUA="$(WXART2D_USE_LUA)" WXART2D_USE_AGG="$(WXART2D_USE_AGG)" \ BUILD="$(BUILD_EQUIVALENT)" SAMPLES="$(SAMPLES)" \ WXART2D_USE_CVGIO="$(WXART2D_USE_CVGIO)" \ WXART2D_USE_AGGDRAWER="$(WXART2D_USE_AGGDRAWER)" \ WXART2D_USE_ARTBASE="$(WXART2D_USE_ARTBASE)" \ WXART2D_USE_CANEXTOBJ="$(WXART2D_USE_CANEXTOBJ)" \ WXART2D_USE_CANVAS="$(WXART2D_USE_CANVAS)" \ WXART2D_USE_CURVES="$(WXART2D_USE_CURVES)" \ WXART2D_USE_DOCVIEW="$(WXART2D_USE_DOCVIEW)" \ WXART2D_USE_EDITOR="$(WXART2D_USE_EDITOR)" \ WXART2D_USE_GDSIO="$(WXART2D_USE_GDSIO)" \ WXART2D_USE_KBOOL="$(WXART2D_USE_KBOOL)" \ WXART2D_USE_KEYIO="$(WXART2D_USE_KEYIO)" \ WXART2D_USE_LUAWRAPS="$(WXART2D_USE_LUAWRAPS)" \ WXART2D_USE_STSL="$(WXART2D_USE_STSL)" \ WXART2D_USE_SVGIO="$(WXART2D_USE_SVGIO)" \ WXART2D_USE_XMLPARSE="$(WXART2D_USE_XMLPARSE)" MARS="$(MARS)" \ TETO="$(TETO)" ### Conditionally set variables: ### ifeq ($(WXART2D_USE_AGGDRAWER),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = -DA2DAGGDRAWERMAKINGDLL endif endif ifeq ($(WXART2D_USE_ARTBASE),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DARTBASEMAKINGDLL endif endif ifeq ($(WXART2D_USE_CANEXTOBJ),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCANEXTOBJMAKINGDLL endif endif ifeq ($(WXART2D_USE_CANVAS),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCANVASMAKINGDLL endif endif ifeq ($(WXART2D_USE_CURVES),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCURVESMAKINGDLL endif endif ifeq ($(WXART2D_USE_DOCVIEW),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DDOCVIEWMAKINGDLL endif endif ifeq ($(WXART2D_USE_EDITOR),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DEDITORMAKINGDLL endif endif ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DGENERALMAKINGDLL endif ifeq ($(WXART2D_USE_GDSIO),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DGDSIOMAKINGDLL endif endif ifeq ($(WXART2D_USE_KBOOL),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DKBOOLMAKINGDLL endif endif ifeq ($(WXART2D_USE_KEYIO),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DKEYIOMAKINGDLL endif endif ifeq ($(WXART2D_USE_LUAWRAPS),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DLUAWRAPSMAKINGDLL endif endif ifeq ($(WXART2D_USE_STSL),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DSTSLMAKINGDLL endif endif ifeq ($(WXART2D_USE_SVGIO),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DSVGIOMAKINGDLL endif endif ifeq ($(WXART2D_USE_XMLPARSE),1) ifeq ($(WX_SHARED),1) SHARED_DEFINES = $(SHARED_DEFINES) -DA2DXMLPARSEMAKINGDLL endif endif ifeq ($(WXART2D_USE_AGG),1) THIRDPARTY_INCLUDE_PATH = -I..\..\thirdparty\agg2\include endif ifeq ($(WXART2D_USE_EXPAT),1) THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \ -I..\..\thirdparty\expat\include endif ifeq ($(WXART2D_USE_FREETYPE),1) THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \ -I..\..\thirdparty\freetype\include endif ifeq ($(WXART2D_USE_LUA),1) THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \ -I..\..\thirdparty\wxLua\include endif ifeq ($(WXART2D_USE_AGG),1) THIRDPARTY_LIB_PATH = -L..\..\thirdparty\agg2\lib endif ifeq ($(WXART2D_USE_EXPAT),1) THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\expat\lib endif ifeq ($(WXART2D_USE_FREETYPE),1) THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\freetype\lib endif ifeq ($(WXART2D_USE_LUA),1) THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\wxLua\lib endif ifeq ($(WX_DEBUG),1) BUILD_EQUIVALENT = debug endif ifeq ($(WX_DEBUG),1) BUILD_EQUIVALENT = release endif ### Targets: ### all: thirdyparty modules apps clean: -if exist .\*.o del .\*.o $(MAKE) -C ..\..\thirdparty\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean thirdyparty: $(MAKE) -C ..\..\thirdparty\build\msw -f makefile.gcc $(MAKEARGS) modules: $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) apps: $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) docs: @echo ============================================= @echo Creating wxArt2d docs using doxygen... @echo ============================================= cd ..\..\doc doxygen doxygen.inc .PHONY: all clean thirdyparty modules apps |
|
From: Francesco <fr...@us...> - 2005-06-12 18:29:29
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25491/build/bakefiles Added Files: Bakefiles.bkgen globalregen.bat regen.bat utils.bkl wxlua.bkl wxluabase.bkl Log Message: Initial upload of bakefile build system --- NEW FILE: regen.bat --- @echo off REM REM MAKEFILE REGENERATION SCRIPT (for WinXP) REM REM author: Francesco Montorsi (fr...@us...) REM date: 18-8-2004 echo. echo. echo Regenerating makefiles for MSVC, BORLAND, MINGW and AUTOCONF... echo. bakefile_gen echo. echo Regeneration completed. echo. echo. pause --- NEW FILE: wxluabase.bkl --- <?xml version="1.0" ?> <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- RCS-ID: $Id: wxluabase.bkl,v 1.1 2005/06/12 18:29:20 frm Exp $ --> <!-- --> <!-- WXLUA GENERIC BAKEFILE --> <!-- --> <!-- This bakefile can be used by all wxLua-based apps and --> <!-- libraries. --> <!-- --> <makefile> <using module="datafiles"/> <!-- 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"/> <!-- --> <!-- VARIABLES --> <!-- --> <!-- Some infos on the version. --> <set var="WXLUA_MAJOR">2</set> <set var="WXLUA_MINOR">6</set> <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> <!-- 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... --> </set> <!-- some path stuff --> <if cond="TARGETING_WIN32=='1'"> <!-- Win32 makefiles will be put in BUILD/MSW --> <set var="WXLUA_BASEDIR">..$(DIRSEP)..</set> </if> <if cond="TARGETING_WIN32=='0'"> <!-- Unix makefiles will be put in the main folder --> <set var="WXLUA_BASEDIR">.</set> </if> <set var="WXLUA_LIBOUTPUT_FOLDER"> <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> lib$(DIRSEP)$(COMPILER)_lib </if> <if cond="TARGETING_WIN32=='0'"> lib </if> </set> <set var="WXLUA_DLLOUTPUT_FOLDER"> <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> lib$(DIRSEP)$(COMPILER)_dll </if> <if cond="TARGETING_WIN32=='0'"> lib </if> </set> <set var="WXLUA_OUTPUT_FOLDER"> <if cond="TARGETING_WIN32=='1' and WX_SHARED=='1'">$(WXLUA_DLLOUTPUT_FOLDER)</if> <if cond="TARGETING_WIN32=='1' and WX_SHARED=='0'">$(WXLUA_LIBOUTPUT_FOLDER)</if> <if cond="TARGETING_WIN32=='0'">lib</if> <!-- shared & static builds go to the same folder --> </set> <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> <!-- --> <!-- TEMPLATES --> <!-- --> <!-- just a placeholder to mark the place where <lua-lib> will be placed, 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 $(value) library; this is because wxLua does not adopt special library namings like wx does --> <define-tag name="lua-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="lua-req-libs" rules="exe,dll,module"/> <!-- some tag infos --> <tag-info name="lua-lib" position="before:lua-req-libs"/> <tag-info name="lua-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)include</include> <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> <!-- 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 --> </template> <!-- a template for wxLua-based exe/dll targets --> <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> </makefile> --- NEW FILE: Bakefiles.bkgen --- <?xml version="1.0" ?> <!-- $Id: Bakefiles.bkgen,v 1.1 2005/06/12 18:29:20 frm Exp $ --> <bakefile-gen> <disable-formats>gnu,dmars,cbx_unix,cbuilderx</disable-formats> <input>wxlua.bkl</input> <!-- required since wxArt2d uses wx presets stored in wxWidgets subfolders... --> <add-flags>-I%WXWIN%\build\bakefiles\wxpresets</add-flags> <!-- 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: --> <add-flags formats="borland"> -o../msw/makefile.bcc </add-flags> <add-flags formats="dmars_smake"> -o../msw/makefile.dms </add-flags> <add-flags formats="dmars"> -o../msw/makefile.dmc </add-flags> <add-flags formats="mingw"> -o../msw/makefile.gcc </add-flags> <add-flags formats="msvc"> -o../msw/makefile.vc </add-flags> <add-flags formats="watcom"> -o../msw/makefile.wat </add-flags> <add-flags formats="msvc6prj"> -o../msw/wxlua.dsw </add-flags> <!-- Directory where AUTOCONF files should go: --> <add-flags formats="autoconf"> -o../../Makefile.in </add-flags> <add-flags formats="autoconf"> -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 </add-flags> </bakefile-gen> --- NEW FILE: wxlua.bkl --- <?xml version="1.0" ?> <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- RCS-ID: $Id: wxlua.bkl,v 1.1 2005/06/12 18:29:20 frm Exp $ --> <!-- --> <!-- WXLUA MAIN BAKEFILE --> <!-- --> <makefile> <!-- This is required because it contains the definitions of a lot of utils --> <include file="wxluabase.bkl"/> <!-- This file contains the list of UTILS options --> <include file="../../utils/build/bakefiles/options.bkl"/> <!-- This file contains the list of MODULES options --> <include file="../../modules/build/bakefiles/options.bkl"/> <!-- This file contains the list of APPS options --> <include file="../../apps/build/bakefiles/options.bkl"/> <!-- --> <!-- The utils --> <!-- --> <subproject id="utils"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)utils$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> </subproject> <!-- --> <!-- The modules libraries & samples --> <!-- --> <subproject id="modules"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)modules$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> </subproject> <!-- --> <!-- The wxLua applications --> <!-- --> <subproject id="apps"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> </subproject> <!-- --> <!-- Miscellaneous utility targets --> <!-- --> <!-- <action id="docs"> <command>@echo =============================================</command> <command>@echo Creating wxArt2d docs using doxygen... </command> <command>@echo =============================================</command> <command>cd ..\..\doc</command> <command>doxygen doxygen.inc</command> </action> --> </makefile> --- NEW FILE: utils.bkl --- <?xml version="1.0" ?> <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- Date: 1/5/2005 --> <!-- 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. --> <!-- Usage sample: --> <!-- <action id="uninstall-lib"> --> <!-- <rmfile>$(LIBDIR)/*mylib*</rmfile> --> <!-- </action> --> <define-tag name="rmfile" rules="action"> <if cond="TARGETING_WIN32=='0'"> <command>rm -f $(value)</command> </if> <if cond="TARGETING_WIN32=='1' and FORMAT!='mingw'"> <command>-if exist $(value) del /Q $(value)</command> </if> <if cond="TARGETING_WIN32=='1' and FORMAT=='mingw'"> <!-- The MINGW format needs the "then" keyword... --> <command>-if exist $(value) then del /Q $(value)</command> </if> </define-tag> <!-- Recursively removes the $(value) file from the current folder. --> <!-- Usage sample: --> <!-- <action id="deepclean"> --> <!-- <rmfile-rec>$(BUILDDIR)/*.o</rmfile> --> <!-- </action> --> <define-tag name="rmfile-rec" rules="action"> <if cond="TOOLSET=='unix'"><command>$(RM) -r $(value)</command></if> <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. --> <!-- To each file is prepended the $(DESTDIR)$(INCLUDEDIR)/ --> <!-- string (the file list is supposed to be a list of headers)... --> <!-- Usage sample: --> <!-- <set var="MYPRJ_HDR"> --> <!-- hdr1.h wx/hdr2.h --> <!-- </set> --> <!-- <modify-target target="uninstall"> --> <!-- <rmheaders>$(BUILDDIR)/*.o</rmheaders> --> <!-- </modify-target> --> <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> </define-tag> <!-- Removes the $(value) folder. --> <!-- Usage sample: --> <!-- <action id="uninstall-scripts"> --> <!-- <rmdir>$(DATADIR)/myscripts</rmdir> --> <!-- </action> --> <define-tag name="rmdir" rules="action"> <if cond="TARGETING_WIN32=='0'"> <command>rm -rf $(value)</command> </if> <if cond="TARGETING_WIN32=='1' and FORMAT!='mingw'"> <command>-if exist $(value) rmdir /S /Q $(value)</command> </if> <if cond="TARGETING_WIN32=='1' and FORMAT=='mingw'"> <!-- The MINGW format needs the "then" keyword... --> <command>-if exist $(value) then rmdir /S /Q $(value)</command> </if> </define-tag> <!-- Removes the intermediate folders whose names are composed as --> <!-- "$(value)[u][d]" where 'u' is used when Unicode is enabled and --> <!-- 'd' is used for debug builds. --> <!-- Usage sample: --> <!-- <set var="BUILDDIR">$(FORMAT)$(WXLIBPOSTFIX)</set> --> <!-- <action id="deepclean"> --> <!-- <rmintdir>$(FORMAT)</rmintdir> --> <!-- </action> --> <define-tag name="rmintdir" rules="action"> <rmdir>$(value)</rmdir> <rmdir>$(value)d</rmdir> <rmdir>$(value)u</rmdir> <rmdir>$(value)ud</rmdir> </define-tag> <!-- Removes *all* intermediate files from the given folder --> <!-- recursively. --> <!-- Usage sample: --> <!-- <action id="deepclean"> --> <!-- <rmintfiles>build</rmintfiles> --> <!-- </action> --> <define-tag name="rmintfiles" rules="action"> <!-- remove results --> <rmfile-rec>$(value)$(DIRSEP)*.a</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.lib</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.pdb</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.dll</rmfile-rec> <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> <rmfile-rec>$(value)$(DIRSEP)*.o</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.log</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.manifest*</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.log</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP).bakefile_gen.state</rmfile-rec> <!-- MSVC --> <rmfile-rec>$(value)$(DIRSEP)*.pch</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.ncb</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.plg</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.ncb</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.aps</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.suo</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)*.user</rmfile-rec> <!-- Borland --> <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> <rmdir>$(value)$(DIRSEP).deps</rmdir> <rmfile-rec>$(value)$(DIRSEP)config.status</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)config.log</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)Makefile</rmfile-rec> <rmfile-rec>$(value)$(DIRSEP)bk-deps</rmfile-rec> </define-tag> <!-- --> <!-- NEW RULES --> <!-- --> <!-- Changes the current directory to the folder given to the CD --> <!-- tag and then executes the command given to the RUN tag. --> <!-- Usage sample: --> <!-- <cd-and-run id="tarball"> --> <!-- <cd>..</cd> --> <!-- <run>tar -cvzf tarball.tar.gz myproj/*</run> --> <!-- </cd-and-run> --> <define-rule name="cd-and-run" extends="action"> <template> <set var="__cmddir"/> <set var="__cmdstr"/> </template> <define-tag name="cd"> <set var="__cmddir">$(nativePaths(value))</set> </define-tag> <define-tag name="run"> <set var="__cmdstr">$(value)</set> <if cond="FORMAT=='msvc' or FORMAT=='mingw' or FORMAT=='gnu' or FORMAT=='autoconf'"> <command>( cd $(__cmddir) && $(__cmdstr) )</command> </if> <if cond="FORMAT=='borland' or FORMAT=='watcom'"> <command>-cd $(__cmddir)</command> <command>-$(__cmdstr)</command> </if> </define-tag> </define-rule> </makefile> --- NEW FILE: globalregen.bat --- @echo off REM REM MAKEFILE REGENERATION SCRIPT (for WinXP) REM REM author: Francesco Montorsi (fr...@us...) REM date: 18-8-2004 echo. echo. echo Regenerating makefiles for all wxLua project... echo. bakefile_gen ( 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. echo. echo. pause |
|
From: Francesco <fr...@us...> - 2005-06-12 18:29:27
|
Update of /cvsroot/wxlua/wxLua/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25491/bin Added Files: luad.exe Log Message: Initial upload of bakefile build system --- NEW FILE: luad.exe --- (This appears to be a binary file; contents omitted.) |
|
From: Francesco <fr...@us...> - 2005-06-12 14:30:59
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3222/bakefiles Log Message: Directory /cvsroot/wxlua/wxLua/modules/build/bakefiles added to the repository |
|
From: Francesco <fr...@us...> - 2005-06-12 14:30:59
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3222/msw Log Message: Directory /cvsroot/wxlua/wxLua/modules/build/msw added to the repository |
|
From: Francesco <fr...@us...> - 2005-06-12 14:17:44
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28037/bakefiles Log Message: Directory /cvsroot/wxlua/wxLua/build/bakefiles added to the repository |
|
From: Francesco <fr...@us...> - 2005-06-12 14:17:44
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28037/msw Log Message: Directory /cvsroot/wxlua/wxLua/build/msw added to the repository |
|
From: Francesco <fr...@us...> - 2005-06-12 14:17:25
|
Update of /cvsroot/wxlua/wxLua/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27895/build Log Message: Directory /cvsroot/wxlua/wxLua/build added to the repository |
|
From: John L. <jr...@us...> - 2005-06-07 20:18:16
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25361/wxLua/apps/wxlua/src Modified Files: wxLua_wx26.dsw Log Message: the libraries don't depend on each other, fixes double link warning 4006 in VC6 Index: wxLua_wx26.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxLua_wx26.dsw,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxLua_wx26.dsw 7 Jun 2005 19:58:25 -0000 1.2 --- wxLua_wx26.dsw 7 Jun 2005 20:18:06 -0000 1.3 *************** *** 36,45 **** Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name lua - End Project Dependency - Begin Project Dependency - Project_Dep_Name lualib_wx26 - End Project Dependency }}} --- 36,39 ---- *************** *** 54,66 **** Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name lua - End Project Dependency - Begin Project Dependency - Project_Dep_Name lualib_wx26 - End Project Dependency - Begin Project Dependency - Project_Dep_Name wxLuaLib_wx26 - End Project Dependency }}} --- 48,51 ---- *************** *** 75,90 **** Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name lua - End Project Dependency - Begin Project Dependency - Project_Dep_Name lualib_wx26 - End Project Dependency - Begin Project Dependency - Project_Dep_Name wxLuaLib_wx26 - End Project Dependency - Begin Project Dependency - Project_Dep_Name wxLuaDebugLib_wx26 - End Project Dependency }}} --- 60,63 ---- |
|
From: John L. <jr...@us...> - 2005-06-07 19:58:35
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14249/wxLua/modules/wxluasocket/src Added Files: wxluasocket_wx26.dsp Log Message: Make it compile using VC6 --- NEW FILE: wxluasocket_wx26.dsp --- # Microsoft Developer Studio Project File - Name="wxLuaSocketLib_wx26" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=wxLuaSocketLib_wx26 - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "wxLuaSocketLib_wx26.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "wxLuaSocketLib_wx26.mak" CFG="wxLuaSocketLib_wx26 - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "wxLuaSocketLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaSocketLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "wxLuaSocketLib_wx26 - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_msw_wx26" # PROP BASE Intermediate_Dir "vc_msw_wx26" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_msw_wx26" # PROP Intermediate_Dir "vc_msw_wx26" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /W4 /Fdvc_msw_wx26\wxluasocket_wx26.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /c # ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /I "../../" /I "$(WXWIN)\contrib\include" /W4 /Fdvc_msw_wx26\wxluasocket_wx26.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxluasocket_wx26.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\wxluasocket_wx26.lib" !ELSEIF "$(CFG)" == "wxLuaSocketLib_wx26 - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswd_wx26" # PROP BASE Intermediate_Dir "vc_mswd_wx26" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswd_wx26" # PROP Intermediate_Dir "vc_mswd_wx26" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /W4 /Zi /Gm /GZ /Fdvc_mswd_wx26\wxluasocketd_wx26.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /c # ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /I "../../" /I "$(WXWIN)\contrib\include" /W4 /Zi /Gm /GZ /Fdvc_mswd_wx26\wxluasocketd_wx26.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxluasocketd_wx26.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\wxluasocketd_wx26.lib" !ENDIF # Begin Target # Name "wxLuaSocketLib_wx26 - Win32 Release" # Name "wxLuaSocketLib_wx26 - Win32 Debug" # PROP Default_Filter "" # Begin Source File SOURCE=..\include\debugio.h # End Source File # Begin Source File SOURCE=..\include\dserver.h # End Source File # Begin Source File SOURCE=..\include\dtarget.h # End Source File # Begin Source File SOURCE=..\include\socket.h # End Source File # Begin Source File SOURCE=.\debugio.cpp # End Source File # Begin Source File SOURCE=.\dserver.cpp # End Source File # Begin Source File SOURCE=.\dtarget.cpp # End Source File # Begin Source File SOURCE=.\socket.cpp # End Source File # End Target # End Project |
|
From: John L. <jr...@us...> - 2005-06-07 19:58:34
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14249/wxLua/apps/wxlua/src Modified Files: wrap.bat wxLua_wx26.dsp wxLua_wx26.dsw wxlua.rc Log Message: Make it compile using VC6 Index: wxlua.rc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.rc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua.rc 7 Jun 2005 04:17:29 -0000 1.1 --- wxlua.rc 7 Jun 2005 19:58:25 -0000 1.2 *************** *** 8,12 **** ///////////////////////////////////////////////////////////////////////////// ! lua ICON "wxlua.ico" //logo BITMAP "..\examples\bitmaps\wxLua.bmp" --- 8,12 ---- ///////////////////////////////////////////////////////////////////////////// ! lua ICON "..\\..\\..\\art\\wxlua.ico" //logo BITMAP "..\examples\bitmaps\wxLua.bmp" Index: wxLua_wx26.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxLua_wx26.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxLua_wx26.dsp 7 Jun 2005 04:17:29 -0000 1.1 --- wxLua_wx26.dsp 7 Jun 2005 19:58:25 -0000 1.2 *************** *** 42,47 **** # PROP Intermediate_Dir "vc_msw_wx26" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 42,47 ---- # PROP Intermediate_Dir "vc_msw_wx26" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\..\..\modules" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\..\..\modules" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 52,57 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 ..\lib\lua50_wx26.lib ..\lib\wxlualib_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua_wx26.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 ..\lib\lua50_wx26.lib ..\lib\wxlualib_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua_wx26.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" --- 52,57 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" *************** *** 67,72 **** # PROP Intermediate_Dir "vc_mswd_wx26" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 --- 67,72 ---- # PROP Intermediate_Dir "vc_mswd_wx26" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\..\..\modules" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\..\..\modules" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 77,83 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 ..\lib\lua50d_wx26.lib ..\lib\wxlualibd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLua_wx26.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 ..\lib\lua50d_wx26.lib ..\lib\wxlualibd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLua_wx26.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! --- 77,82 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows *************** *** 91,107 **** # Begin Source File ! SOURCE=.\wxLua.ico # End Source File # Begin Source File ! SOURCE=..\import\override.hpp # End Source File # Begin Source File ! SOURCE=..\import\wxLuaWrap.i !IF "$(CFG)" == "wxLua_wx26 - Win32 Release" ! USERDEP__WXLUA="..\import\override.hpp" # Begin Custom Build - Generating Binding --- 90,106 ---- # Begin Source File ! SOURCE=..\..\..\icons\wxlua.ico # End Source File # Begin Source File ! SOURCE=..\..\..\bindings\wxwidgets\override.hpp # End Source File # Begin Source File ! SOURCE=..\..\..\bindings\wxwidgets\wxluawrap.i !IF "$(CFG)" == "wxLua_wx26 - Win32 Release" ! USERDEP__WXLUA="..\..\..\bindings\wxwidgets\override.hpp" # Begin Custom Build - Generating Binding *************** *** 114,118 **** !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" ! USERDEP__WXLUA="..\import\override.hpp" # Begin Custom Build - Generating Binding --- 113,117 ---- !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" ! USERDEP__WXLUA="..\..\..\bindings\wxwidgets\override.hpp" # Begin Custom Build - Generating Binding *************** *** 128,132 **** # Begin Source File ! SOURCE=.\wxLuaWrap.cpp # End Source File # Begin Source File --- 127,131 ---- # Begin Source File ! SOURCE=.\wxluawrap.cpp # End Source File # Begin Source File *************** *** 136,144 **** # Begin Source File ! SOURCE=.\wxluaapp.cpp # End Source File # Begin Source File ! SOURCE=.\wxluaapp.h # End Source File # Begin Source File --- 135,143 ---- # Begin Source File ! SOURCE=.\wxlua.cpp # End Source File # Begin Source File ! SOURCE=.\wxlua.h # End Source File # Begin Source File Index: wrap.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wrap.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wrap.bat 7 Jun 2005 04:17:29 -0000 1.1 --- wrap.bat 7 Jun 2005 19:58:25 -0000 1.2 *************** *** 6,15 **** :RELEASE ! ..\bin\lua -e"target=\"msw\"" wrap.lua echo Creating wrappers release goto END :DEBUG ! ..\bin\luad -e"target=\"msw\"" wrap.lua echo Creating wrappers debug goto END --- 6,15 ---- :RELEASE ! ..\..\..\bin\lua -e"target=\"msw\"" wrap.lua echo Creating wrappers release goto END :DEBUG ! ..\..\..\bin\luad -e"target=\"msw\"" wrap.lua echo Creating wrappers debug goto END Index: wxLua_wx26.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxLua_wx26.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxLua_wx26.dsw 7 Jun 2005 04:17:29 -0000 1.1 --- wxLua_wx26.dsw 7 Jun 2005 19:58:25 -0000 1.2 *************** *** 4,8 **** ############################################################################### ! Project: "lua"=..\lua\src\lua\lua.dsp - Package Owner=<4> Package=<5> --- 4,8 ---- ############################################################################### ! Project: "lua"=..\..\..\modules\lua\src\lua\lua.dsp - Package Owner=<4> Package=<5> *************** *** 16,20 **** ############################################################################### ! Project: "lua50_wx26"=..\lua\lua50_wx26.dsp - Package Owner=<4> Package=<5> --- 16,20 ---- ############################################################################### ! Project: "lualib_wx26"=..\..\..\modules\lua\lualib_wx26.dsp - Package Owner=<4> Package=<5> *************** *** 28,32 **** ############################################################################### ! Project: "wxLuaLib_wx26"=..\src\wxLuaLib_wx26.dsp - Package Owner=<4> Package=<5> --- 28,32 ---- ############################################################################### ! Project: "wxLuaLib_wx26"=..\..\..\modules\wxlua\src\wxlualib_wx26.dsp - Package Owner=<4> Package=<5> *************** *** 40,44 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name lua50_wx26 End Project Dependency }}} --- 40,89 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name lualib_wx26 ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "wxLuaDebugLib_wx26"=..\..\..\modules\wxluadebug\src\wxluadebug_wx26.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name lua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name lualib_wx26 ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name wxLuaLib_wx26 ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "wxLuaSocketLib_wx26"=..\..\..\modules\wxluasocket\src\wxluasocket_wx26.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name lua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name lualib_wx26 ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name wxLuaLib_wx26 ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name wxLuaDebugLib_wx26 End Project Dependency }}} *************** *** 58,66 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name lua50_wx26 End Project Dependency Begin Project Dependency Project_Dep_Name wxLuaLib_wx26 End Project Dependency }}} --- 103,117 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name lualib_wx26 End Project Dependency Begin Project Dependency Project_Dep_Name wxLuaLib_wx26 End Project Dependency + Begin Project Dependency + Project_Dep_Name wxLuaDebugLib_wx26 + End Project Dependency + Begin Project Dependency + Project_Dep_Name wxLuaSocketLib_wx26 + End Project Dependency }}} |
|
From: John L. <jr...@us...> - 2005-06-07 19:58:34
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14249/wxLua/modules/wxluadebug/src Added Files: wxluadebug_wx26.dsp Log Message: Make it compile using VC6 --- NEW FILE: wxluadebug_wx26.dsp --- # Microsoft Developer Studio Project File - Name="wxLuaDebugLib_wx26" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=wxLuaDebugLib_wx26 - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "wxLuaDebugLib_wx26.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "wxLuaDebugLib_wx26.mak" CFG="wxLuaDebugLib_wx26 - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "wxLuaDebugLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaDebugLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "wxLuaDebugLib_wx26 - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_msw_wx26" # PROP BASE Intermediate_Dir "vc_msw_wx26" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_msw_wx26" # PROP Intermediate_Dir "vc_msw_wx26" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /W4 /Fdvc_msw_wx26\wxluadebug_wx26.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /c # ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /I "../../" /I "$(WXWIN)\contrib\include" /W4 /Fdvc_msw_wx26\wxluadebug_wx26.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxluadebug_wx26.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\wxluadebug_wx26.lib" !ELSEIF "$(CFG)" == "wxLuaDebugLib_wx26 - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswd_wx26" # PROP BASE Intermediate_Dir "vc_mswd_wx26" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswd_wx26" # PROP Intermediate_Dir "vc_mswd_wx26" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /W4 /Zi /Gm /GZ /Fdvc_mswd_wx26\wxluadebugd_wx26.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /c # ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /I "../../" /I "$(WXWIN)\contrib\include" /W4 /Zi /Gm /GZ /Fdvc_mswd_wx26\wxluadebugd_wx26.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxluadebugd_wx26.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\wxluadebugd_wx26.lib" !ENDIF # Begin Target # Name "wxLuaDebugLib_wx26 - Win32 Release" # Name "wxLuaDebugLib_wx26 - Win32 Debug" # PROP Default_Filter "" # Begin Source File SOURCE=..\include\debug.h # End Source File # Begin Source File SOURCE=..\include\splttree.h # End Source File # Begin Source File SOURCE=..\include\staktree.h # End Source File # Begin Source File SOURCE=.\debug.cpp # End Source File # Begin Source File SOURCE=.\splttree.cpp # End Source File # Begin Source File SOURCE=.\staktree.cpp # End Source File # End Target # End Project |
|
From: John L. <jr...@us...> - 2005-06-07 19:58:33
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14249/wxLua/modules/wxlua/src Added Files: wxlualib_wx26.dsp Log Message: Make it compile using VC6 --- NEW FILE: wxlualib_wx26.dsp --- # Microsoft Developer Studio Project File - Name="wxLuaLib_wx26" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=wxLuaLib_wx26 - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "wxLuaLib_wx26.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "wxLuaLib_wx26.mak" CFG="wxLuaLib_wx26 - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "wxLuaLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "wxLuaLib_wx26 - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_msw_wx26" # PROP BASE Intermediate_Dir "vc_msw_wx26" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_msw_wx26" # PROP Intermediate_Dir "vc_msw_wx26" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /W4 /Fdvc_msw_wx26\wxlualib_wx26.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /c # ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /I "../../" /I "$(WXWIN)\contrib\include" /W4 /Fdvc_msw_wx26\wxlualib_wx26.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxlua_wx26.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\wxlua_wx26.lib" !ELSEIF "$(CFG)" == "wxLuaLib_wx26 - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswd_wx26" # PROP BASE Intermediate_Dir "vc_mswd_wx26" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswd_wx26" # PROP Intermediate_Dir "vc_mswd_wx26" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /W4 /Zi /Gm /GZ /Fdvc_mswd_wx26\wxlualibd_wx26.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /c # ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /I "../../" /I "$(WXWIN)\contrib\include" /W4 /Zi /Gm /GZ /Fdvc_mswd_wx26\wxlualibd_wx26.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxluad_wx26.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\wxluad_wx26.lib" !ENDIF # Begin Target # Name "wxLuaLib_wx26 - Win32 Release" # Name "wxLuaLib_wx26 - Win32 Debug" # PROP Default_Filter "" # Begin Source File SOURCE=..\include\callback.h # End Source File # Begin Source File SOURCE=..\include\defs.h # End Source File # Begin Source File SOURCE=..\include\internal.h # End Source File # Begin Source File SOURCE=..\include\interp.h # End Source File # Begin Source File SOURCE=..\include\library.h # End Source File # Begin Source File SOURCE=..\include\wxlua.h # End Source File # Begin Source File SOURCE=.\internal.cpp # End Source File # Begin Source File SOURCE=.\interp.cpp # End Source File # Begin Source File SOURCE=.\library.cpp # End Source File # End Target # End Project |
|
From: John L. <jr...@us...> - 2005-06-07 18:39:56
|
Update of /cvsroot/wxlua/wxLua/modules/lua/src/luac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3089/wxLua/modules/lua/src/luac Modified Files: luac.dsp Log Message: lua compiles to bin and lib dirs from module/lua dir Index: luac.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/luac/luac.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luac.dsp 6 Jun 2005 23:06:17 -0000 1.1 --- luac.dsp 7 Jun 2005 18:39:48 -0000 1.2 *************** *** 9,18 **** !MESSAGE use the Export Makefile command and run !MESSAGE ! !MESSAGE NMAKE /f "Luac.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "Luac.mak" CFG="luac - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: --- 9,18 ---- !MESSAGE use the Export Makefile command and run !MESSAGE ! !MESSAGE NMAKE /f "luac.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "luac.mak" CFG="luac - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: *************** *** 33,46 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\Release" ! # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /FdRelease\luac.pdb /c # ADD CPP /nologo /MD /W4 /GX /O2 /I "..\..\include" /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "LUA_OPNAMES" /D LUACALL=__stdcall /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" --- 33,46 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "vc_msw" ! # PROP BASE Intermediate_Dir "vc_msw" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "vc_msw" ! # PROP Intermediate_Dir "vc_msw" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Fdvc_msw\luac.pdb /c # ADD CPP /nologo /MD /W4 /GX /O2 /I "..\..\include" /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "LUA_OPNAMES" /D LUACALL=__stdcall /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" *************** *** 50,55 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 ! # ADD LINK32 /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "luac - Win32 Debug" --- 50,55 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\bin\luac.exe" ! # ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\bin\luac.exe" !ELSEIF "$(CFG)" == "luac - Win32 Debug" *************** *** 57,70 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\Debug" ! # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /FdDebug\luac.pdb /c # ADD CPP /nologo /MDd /W4 /Gm /GR /GX /ZI /Od /I "..\..\include" /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "LUA_OPNAMES" /D LUACALL=__stdcall /YX /FD /GZ /c # ADD BASE RSC /l 0x809 /d "_DEBUG" --- 57,70 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "vc_mswd" ! # PROP BASE Intermediate_Dir "vc_mswd" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "vc_mswd" ! # PROP Intermediate_Dir "vc_mswd" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /Fdvc_mswd\luac.pdb /c # ADD CPP /nologo /MDd /W4 /Gm /GR /GX /ZI /Od /I "..\..\include" /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "LUA_OPNAMES" /D LUACALL=__stdcall /YX /FD /GZ /c # ADD BASE RSC /l 0x809 /d "_DEBUG" *************** *** 74,79 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF --- 74,79 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"..\..\..\..\bin\luacd.exe" ! # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"..\..\..\..\bin\luacd.exe" !ENDIF |
|
From: John L. <jr...@us...> - 2005-06-07 18:39:56
|
Update of /cvsroot/wxlua/wxLua/modules/lua/src/lua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3089/wxLua/modules/lua/src/lua Modified Files: lua.dsp Log Message: lua compiles to bin and lib dirs from module/lua dir Index: lua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lua/lua.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lua.dsp 6 Jun 2005 23:06:17 -0000 1.1 --- lua.dsp 7 Jun 2005 18:39:47 -0000 1.2 *************** *** 33,47 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /FdRelease\lua.pdb /c ! # ADD CPP /nologo /MD /W4 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /FdRelease\lua.pdb /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" --- 33,47 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "vc_msw" ! # PROP BASE Intermediate_Dir "vc_msw" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "vc_mswd" ! # PROP Intermediate_Dir "vc_msw" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Fdvc_msw\lua.pdb /c ! # ADD CPP /nologo /MD /W4 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Fdvc_msw\lua.pdb /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" *************** *** 50,55 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\..\bin\lua.exe" ! # ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\..\bin\lua.exe" !ELSEIF "$(CFG)" == "lua - Win32 Debug" --- 50,55 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\bin\lua.exe" ! # ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\bin\lua.exe" !ELSEIF "$(CFG)" == "lua - Win32 Debug" *************** *** 57,71 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /FdDebug\luad.pdb /c ! # ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /FdDebug\luad.pdb /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" --- 57,71 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "vc_mswd" ! # PROP BASE Intermediate_Dir "vc_mswd" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "vc_mswd" ! # PROP Intermediate_Dir "vc_mswd" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /Fdvc_mswd\luad.pdb /c ! # ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /Fdvc_mswd\luad.pdb /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" *************** *** 74,79 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"..\..\..\bin\luad.exe" ! # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"..\..\..\bin\luad.exe" !ENDIF --- 74,79 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"..\..\..\..\bin\luad.exe" ! # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"..\..\..\..\bin\luad.exe" !ENDIF |
|
From: John L. <jr...@us...> - 2005-06-07 18:39:56
|
Update of /cvsroot/wxlua/wxLua/modules/lua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3089/wxLua/modules/lua Added Files: lualib_wx26.dsp Removed Files: lua50_wx26.dsp Log Message: lua compiles to bin and lib dirs from module/lua dir --- NEW FILE: lualib_wx26.dsp --- # Microsoft Developer Studio Project File - Name="lualib_wx26" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=lualib_wx26 - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "lualib_wx26.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "lualib_wx26.mak" CFG="lualib_wx26 - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "lualib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "lualib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "lualib_wx26 - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_msw" # PROP BASE Intermediate_Dir "vc_msw" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_msw" # PROP Intermediate_Dir "vc_msw" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "include" /I "." /W4 /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "include" /I "." /W4 /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\lua_wx26.lib" # ADD LIB32 /nologo /out:"..\..\lib\lua_wx26.lib" !ELSEIF "$(CFG)" == "lualib_wx26 - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswd" # PROP BASE Intermediate_Dir "vc_mswd" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswd" # PROP Intermediate_Dir "vc_mswd" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "include" /I "." /W4 /Zi /Gm /GZ /D "WIN32" /D "_LIB" /D "_DEBUG" /D "WXLUA_CODE" /c # ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "include" /I "." /W4 /Zi /Gm /GZ /D "WIN32" /D "_LIB" /D "_DEBUG" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\luad_wx26.lib" # ADD LIB32 /nologo /out:"..\..\lib\luad_wx26.lib" !ENDIF # Begin Target # Name "lualib_wx26 - Win32 Release" # Name "lualib_wx26 - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\SRC\LAPI.C # End Source File # Begin Source File SOURCE=.\SRC\LAPI.H # End Source File # Begin Source File SOURCE=.\SRC\LIB\LAUXLIB.C # End Source File # Begin Source File SOURCE=.\SRC\LIB\LBASELIB.C # End Source File # Begin Source File SOURCE=.\SRC\LCODE.C # End Source File # Begin Source File SOURCE=.\SRC\LCODE.H # End Source File # Begin Source File SOURCE=.\SRC\LIB\LDBLIB.C # End Source File # Begin Source File SOURCE=.\SRC\LDEBUG.C # End Source File # Begin Source File SOURCE=.\SRC\LDEBUG.H # End Source File # Begin Source File SOURCE=.\SRC\LDLLMAIN.C # End Source File # Begin Source File SOURCE=.\SRC\LDO.C # End Source File # Begin Source File SOURCE=.\SRC\LDO.H # End Source File # Begin Source File SOURCE=.\src\ldump.c # End Source File # Begin Source File SOURCE=.\SRC\LFUNC.C # End Source File # Begin Source File SOURCE=.\SRC\LFUNC.H # End Source File # Begin Source File SOURCE=.\SRC\LGC.C # End Source File # Begin Source File SOURCE=.\SRC\LGC.H # End Source File # Begin Source File SOURCE=.\SRC\LIB\LIOLIB.C # End Source File # Begin Source File SOURCE=.\SRC\LLEX.C # End Source File # Begin Source File SOURCE=.\SRC\LLEX.H # End Source File # Begin Source File SOURCE=.\SRC\LLIMITS.H # End Source File # Begin Source File SOURCE=.\SRC\LIB\LMATHLIB.C # End Source File # Begin Source File SOURCE=.\SRC\LMEM.C # End Source File # Begin Source File SOURCE=.\SRC\LMEM.H # End Source File # Begin Source File SOURCE=.\src\lib\loadlib.c # End Source File # Begin Source File SOURCE=.\SRC\LOBJECT.C # End Source File # Begin Source File SOURCE=.\SRC\LOBJECT.H # End Source File # Begin Source File SOURCE=.\SRC\LOPCODES.C # End Source File # Begin Source File SOURCE=.\SRC\LOPCODES.H # End Source File # Begin Source File SOURCE=.\SRC\LPARSER.C # End Source File # Begin Source File SOURCE=.\SRC\LPARSER.H # End Source File # Begin Source File SOURCE=.\lslua50m.def # End Source File # Begin Source File SOURCE=.\SRC\LSTATE.C # End Source File # Begin Source File SOURCE=.\SRC\LSTATE.H # End Source File # Begin Source File SOURCE=.\SRC\LSTRING.C # End Source File # Begin Source File SOURCE=.\SRC\LSTRING.H # End Source File # Begin Source File SOURCE=.\SRC\LIB\LSTRLIB.C # End Source File # Begin Source File SOURCE=.\SRC\LTABLE.C # End Source File # Begin Source File SOURCE=.\SRC\LTABLE.H # End Source File # Begin Source File SOURCE=.\src\lib\ltablib.c # End Source File # Begin Source File SOURCE=.\SRC\LTESTS.C # End Source File # Begin Source File SOURCE=.\SRC\LTM.C # End Source File # Begin Source File SOURCE=.\SRC\LTM.H # End Source File # Begin Source File SOURCE=.\SRC\LUNDUMP.C # End Source File # Begin Source File SOURCE=.\SRC\LUNDUMP.H # End Source File # Begin Source File SOURCE=.\SRC\LVM.C # End Source File # Begin Source File SOURCE=.\SRC\LVM.H # End Source File # Begin Source File SOURCE=.\SRC\LZIO.C # End Source File # Begin Source File SOURCE=.\SRC\LZIO.H # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File SOURCE=.\INCLUDE\LAUXLIB.H # End Source File # Begin Source File SOURCE=.\INCLUDE\LUA.H # End Source File # Begin Source File SOURCE=.\INCLUDE\LUADEBUG.H # End Source File # Begin Source File SOURCE=.\INCLUDE\LUALIB.H # End Source File # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project --- lua50_wx26.dsp DELETED --- |
|
From: John L. <jr...@us...> - 2005-06-07 05:57:54
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30590/wxLua/bindings/wxwidgets Modified Files: gdi.i Log Message: added calculator wxIcon has CopyFromBitmap in GTK since 2.5 Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gdi.i 6 Jun 2005 23:06:07 -0000 1.1 --- gdi.i 7 Jun 2005 05:56:57 -0000 1.2 *************** *** 600,603 **** --- 600,604 ---- %win void CopyFromBitmap(const wxBitmap& bmp) %mac void CopyFromBitmap(const wxBitmap& bmp) + ~<wxver25 %gtk void CopyFromBitmap(const wxBitmap& bmp) int GetDepth() int GetWidth() |
|
From: John L. <jr...@us...> - 2005-06-07 05:57:23
|
Update of /cvsroot/wxlua/wxLua/samples/calculator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30590/wxLua/samples/calculator Added Files: calculator.wx.lua calculator.wxr calculator.xrc Log Message: added calculator wxIcon has CopyFromBitmap in GTK since 2.5 --- NEW FILE: calculator.xrc --- <?xml version="1.0" ?> <resource> <object class="wxDialog" name="dialog1"> <pos>10,10d</pos> <size>67,106d</size> <style>wxRAISED_BORDER|wxDEFAULT_DIALOG_STYLE|wxCAPTION|wxTHICK_FRAME|wxRESIZE_BORDER|wxSYSTEM_MENU</style> <font> <size>8</size> <face>swiss</face> </font> <title>Calc</title> <object class="wxButton" name="button0"> <pos>4,91d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>0</label> </object> <object class="wxButton" name="button1"> <pos>4,75d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>1</label> </object> <object class="wxButton" name="button2"> <pos>20,75d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>2</label> </object> <object class="wxButton" name="button3"> <pos>36,75d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>3</label> </object> <object class="wxButton" name="button4"> <pos>4,59d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>4</label> </object> <object class="wxButton" name="button5"> <pos>20,59d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>5</label> </object> <object class="wxButton" name="button6"> <pos>36,59d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>6</label> </object> <object class="wxButton" name="button7"> <pos>4,43d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>7</label> </object> <object class="wxButton" name="button8"> <pos>20,43d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>8</label> </object> <object class="wxButton" name="button9"> <pos>36,43d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>9</label> </object> <object class="wxButton" name="button_decimal"> <pos>20,91d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>.</label> </object> <object class="wxButton" name="button_equals"> <pos>36,91d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>=</label> </object> <object class="wxButton" name="button_divide"> <pos>52,43d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>/</label> </object> <object class="wxButton" name="button_multiply"> <pos>52,59d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>x</label> </object> <object class="wxButton" name="button_minus"> <pos>52,75d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>-</label> </object> <object class="wxButton" name="button_plus"> <pos>52,91d</pos> <size>12,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>+</label> </object> <object class="wxButton" name="button_clear"> <pos>4,28d</pos> <size>29,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>C</label> </object> <object class="wxButton" name="button_off"> <pos>36,28d</pos> <size>28,12d</size> <font> <size>8</size> <face>swiss</face> </font> <label>OFF</label> </object> <object class="wxStaticText" name="statictext1"> <pos>4,9d</pos> <size>56,16d</size> <font> <size>10</size> <face>swiss</face> </font> <label>0</label> </object> <object class="wxStaticBox" name="staticbox1"> <pos>2,2d</pos> <size>64,18d</size> <font> <size>10</size> <face>swiss</face> </font> <label></label> </object> </object> </resource> --- NEW FILE: calculator.wx.lua --- -------------------------------------------------------------------------=--- -- Name: Calculator.wx.lua -- Purpose: Calculator wxLua sample -- Author: J Winwood -- Based on the wxWindows sample by Marco Ghislanzoni -- Created: March 2002 -- Updated January 2003 to use XML resources -- Copyright: (c) 2002-2003 Lomtick Software. All rights reserved. -- Licence: wxWindows licence -------------------------------------------------------------------------=--- ID_0 = 102 ID_1 = 103 ID_2 = 104 ID_3 = 105 ID_4 = 106 ID_5 = 107 ID_6 = 108 ID_7 = 109 ID_8 = 110 ID_9 = 111 ID_DECIMAL = 112 ID_EQUALS = 113 ID_PLUS = 114 ID_MINUS = 115 ID_MULTIPLY = 116 ID_DIVIDE = 117 ID_CLEAR = 118 ID_OFF = 119 local xpmdata = { "16 16 6 1", " s None c None", ". c #000000", "+ c #c0c0c0", "@ c #808080", "# c #ffff00", "$ c #ffffff", " ", " @@@@@ ", " @#+#+#@ ", " @#+#+#+#@@@@@@ ", " @$$$$$$$$$$$$@.", " @$#+#+#+#+#+#@.", " @$+#+#+@+#+#+@.", " @$#+#+@+@+#+#@.", " @$+#+@+#+@+#+@.", " @$#+@+#+#+@+#@.", " @$+#+#+#+#+#+@.", " @$#+#+#+#+#+#@.", " @@@@@@@@@@@@@@.", " ..............", " ", " " } bitmap = wx.wxBitmapFromXPMData(xpmdata) icon = wx.wxDefaultIcon() icon:CopyFromBitmap(bitmap) -- return the path part of the currently executing file local strAt = string.byte('@') function getPath() function findLast(filePath) local lastOffset = nil local offset repeat offset = string.find(filePath, "\\") if offset == nil then offset = string.find(filePath, "/") end if offset then if not lastOffset then lastOffset = offset else lastOffset = lastOffset + offset end filePath = string.sub(filePath, offset + 1) end until not offset return lastOffset end local filePath = debug.getinfo(1, "S").source if string.byte(filePath) == strAt then local offset = findLast(filePath) if offset ~= nil then -- remove the @ at the front up to just before the path separator filePath = string.sub(filePath, 2, offset - 1) else filePath = "." end else filePath = wx.wxGetCwd().."/Examples" end return filePath end dialog = nil res = nil txtDisplay = nil -- old style resources (if present) if wx.wxResourceParseFile then wx.wxResourceParseFile(getPath().."/calculator.wxr") -- Create main dialog using default constructor dialog = wx.wxEmptyDialog() if dialog:LoadFromResource(wx.wxNull, "dialog1") == wx.FALSE then wx.wxMessageBox("Error loading wxr resources!", "Calculator", wx.wxOK + wx.wxICON_EXCLAMATION, dialog) wx.wxExit(0) end txtDisplay = wx.wxFindWindowByName("statictext1", dialog); if not txtDisplay then wx.wxError([[Unable to find window "statictext1" in the dialog]]) end else -- xml style resources (if present) res = wx.wxXmlResourceGetDefault() res:InitAllHandlers() res:Load(getPath().."/calculator.xrc") dialog = wx.wxEmptyDialog() if res:LoadDialogCreate(dialog, wx.wxNull, "dialog1") == wx.FALSE then wx.wxMessageBox("Error loading xrc resources!", "Calculator", wx.wxOK + wx.wxICON_EXCLAMATION, wx.wxNull) wx.wxExit(0) end txtDisplay = dialog:FindWindow(res:GetXRCID("statictext1")) if not txtDisplay then wx.wxError([[Unable to find window "statictext1" in the dialog]]) end ID_0 = res:GetXRCID("button0") ID_1 = res:GetXRCID("button1") ID_2 = res:GetXRCID("button2") ID_3 = res:GetXRCID("button3") ID_4 = res:GetXRCID("button4") ID_5 = res:GetXRCID("button5") ID_6 = res:GetXRCID("button6") ID_7 = res:GetXRCID("button7") ID_8 = res:GetXRCID("button8") ID_9 = res:GetXRCID("button9") ID_DECIMAL = res:GetXRCID("button_decimal") ID_EQUALS = res:GetXRCID("button_equals") ID_PLUS = res:GetXRCID("button_plus") ID_MINUS = res:GetXRCID("button_minus") ID_MULTIPLY = res:GetXRCID("button_multiply") ID_DIVIDE = res:GetXRCID("button_divide") ID_OFF = res:GetXRCID("button_off") ID_CLEAR = res:GetXRCID("button_clear") end dialog:SetIcon(icon) if not txtDisplay:DynamicCast("wxStaticText") then wx.wxError([[window "statictext1" is not a "wxStaticText" or is not derived from it"]]) end txtDisplay:SetLabel("0") lastNumber = 0 lastOperation = ID_PLUS clearDisplay = nil function OnClear(event) txtDisplay:SetLabel("0") lastNumber = 0 lastOperation = ID_PLUS end function OnNumber(event) local number = event:GetId() local displayString = txtDisplay:GetLabel() if displayString == "0" or clearDisplay then displayString = "" end clearDisplay = nil -- Limit string length to 12 chars if string.len(displayString) < 12 then if number == ID_DECIMAL then -- If the first pressed char is "." then we want "0." if string.len(displayString) == 0 then displayString = displayString.."0." else displayString = displayString.."." end else number = number - ID_0 -- If first character entered is 0 we reject it if number == 0 and string.len(displayString) == 0 then displayString = "0" elseif displayString == "" then displayString = number else displayString = displayString..number end end txtDisplay:SetLabel(displayString) end end function DoOperation(a, b, operation) local result = a if operation == ID_PLUS then result = b + a elseif operation == ID_MINUS then result = b - a elseif operation == ID_MULTIPLY then result = b * a elseif operation == ID_DIVIDE then if a == 0 then result = "Error" else result = b / a end end return result end function OnOperator(event) -- Get display content local displayString = txtDisplay:GetLabel() local currentOperation = tonumber(displayString) -- Get the required lastOperation local operation = event:GetId() displayString = DoOperation(currentOperation, lastNumber, lastOperation) lastNumber = tonumber(displayString) if lastOperation ~= ID_EQUALS or operation == ID_EQUALS then txtDisplay:SetLabel(displayString) end clearDisplay = 1 lastOperation = operation end function OnQuit(event) -- Hide main dialog dialog:Show(wx.FALSE) wx.wxMessageBox("Calculator sample based on the calc sample written by Marco Ghislanzoni", "Calculator", wx.wxOK + wx.wxICON_INFORMATION) dialog:Destroy() end dialog:ConnectEvent(ID_0, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_1, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_2, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_3, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_4, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_5, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_6, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_7, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_8, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_9, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_DECIMAL, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) dialog:ConnectEvent(ID_EQUALS, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) dialog:ConnectEvent(ID_PLUS, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) dialog:ConnectEvent(ID_MINUS, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) dialog:ConnectEvent(ID_MULTIPLY, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) dialog:ConnectEvent(ID_DIVIDE, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) dialog:ConnectEvent(ID_OFF, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnQuit) dialog:ConnectEvent(ID_CLEAR, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnClear) dialog:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, function(event) OnQuit(event) event:Skip() end) dialog:Centre() dialog:Show(wx.TRUE) accelTable = wx.wxAcceleratorTable{ { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0, ID_0 }, { wx.wxACCEL_NORMAL, string.byte('1'), ID_1 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD1, ID_1 }, { wx.wxACCEL_NORMAL, string.byte('2'), ID_2 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD2, ID_2 }, { wx.wxACCEL_NORMAL, string.byte('3'), ID_3 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD3, ID_3 }, { wx.wxACCEL_NORMAL, string.byte('4'), ID_4 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD4, ID_4 }, { wx.wxACCEL_NORMAL, string.byte('5'), ID_5 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD5, ID_5 }, { wx.wxACCEL_NORMAL, string.byte('6'), ID_6 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD6, ID_6 }, { wx.wxACCEL_NORMAL, string.byte('7'), ID_7 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD7, ID_7 }, { wx.wxACCEL_NORMAL, string.byte('8'), ID_8 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD8, ID_8 }, { wx.wxACCEL_NORMAL, string.byte('9'), ID_9 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD9, ID_9 }, { wx.wxACCEL_NORMAL, string.byte('.'), ID_DECIMAL }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD_DECIMAL, ID_DECIMAL }, { wx.wxACCEL_NORMAL, string.byte('='), ID_EQUALS }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD_ENTER, ID_EQUALS }, { wx.wxACCEL_NORMAL, 13, ID_EQUALS }, { wx.wxACCEL_NORMAL, string.byte('+'), ID_PLUS }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD_ADD, ID_PLUS }, { wx.wxACCEL_NORMAL, string.byte('-'), ID_MINUS }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD_SUBTRACT, ID_MINUS }, { wx.wxACCEL_NORMAL, string.byte('*'), ID_MULTIPLY }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD_MULTIPLY, ID_MULTIPLY }, { wx.wxACCEL_NORMAL, string.byte('/'), ID_DIVIDE }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD_DIVIDE, ID_DIVIDE }, { wx.wxACCEL_NORMAL, string.byte('C'), ID_CLEAR }, { wx.wxACCEL_NORMAL, string.byte('c'), ID_CLEAR }, { wx.wxACCEL_NORMAL, wx.WXK_ESCAPE, ID_OFF } } dialog:SetAcceleratorTable(accelTable) --- NEW FILE: calculator.wxr --- static char *dialog1 = "dialog(name = 'dialog1',\ style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\ title = 'Calc',\ id = 100,\ x = 10, y = 10, width = 67, height = 106,\ background_colour = 'C0C0C0',\ use_dialog_units = 1,\ use_system_defaults = 0,\ font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\ control = [102, wxButton, '0', '0', 'button1', 4, 91, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [103, wxButton, '1', '0', 'button2', 4, 75, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [104, wxButton, '2', '0', 'button3', 20, 75, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [105, wxButton, '3', '0', 'button4', 36, 75, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [106, wxButton, '4', '0', 'button5', 4, 59, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [107, wxButton, '5', '0', 'button6', 20, 59, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [108, wxButton, '6', '0', 'button7', 36, 59, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [109, wxButton, '7', '0', 'button8', 4, 43, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [110, wxButton, '8', '0', 'button9', 20, 43, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [111, wxButton, '9', '0', 'button10', 36, 43, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [112, wxButton, '.', '0', 'button11', 20, 91, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [113, wxButton, '=', '0', 'button12', 36, 91, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [117, wxButton, '/', '0', 'button13', 52, 43, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [116, wxButton, 'x', '0', 'button14', 52, 59, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [115, wxButton, '-', '0', 'button15', 52, 75, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [114, wxButton, '+', '0', 'button16', 52, 91, 12, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [118, wxButton, 'C', '0', 'button17', 4, 28, 29, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [119, wxButton, 'OFF', '0', 'button18', 36, 28, 28, 12, '',\ [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ control = [101, wxStaticText, '0', 'wxALIGN_RIGHT', 'statictext1', 4, 9, 56, 16, '',\ [10, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 'MS Sans Serif']],\ control = [120, wxStaticBox, '', '0', 'staticbox1', 2, 2, 64, 18,\ [10, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']])."; |
|
From: John L. <jr...@us...> - 2005-06-07 05:45:42
|
Update of /cvsroot/wxlua/wxLua/samples/calculator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25311/calculator Log Message: Directory /cvsroot/wxlua/wxLua/samples/calculator added to the repository |
|
From: John L. <jr...@us...> - 2005-06-07 05:37:55
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21454/wxLua/samples Added Files: choices.wx.lua debug.wx.lua debugtest.wx.lua dialog.wx.lua editor.wx.lua fldemo.wx.lua grid.wx.lua htmlwin.wx.lua mdi.wx.lua minimal.wx.lua printing.wx.lua scribble.wx.lua sizer.wx.lua tree.wx.lua veryminimal.wx.lua Log Message: added all the single file samples --- NEW FILE: sizer.wx.lua --- ----------------------------------------------------------------------------- -- Name: Sizer.wx.lua -- Purpose: Shows using sizers in wxLua -- Author: Francis Irving -- Created: 23/01/2002 -- RCS-ID: $Id: sizer.wx.lua,v 1.1 2005/06/07 05:37:45 jrl1 Exp $ -- Copyright: (c) 2002 Creature Labs. All rights reserved. -- Licence: wxWindows licence ----------------------------------------------------------------------------- frame = wx.wxFrame(wx.wxNull, -1, "wxLua sizer test frame") -- Create two controls (note that their parents are the _frame_ (not the sizer)) textEntry = wx.wxTextCtrl(frame, -1, "Enter URL"); button = wx.wxButton(frame, -1, "test") -- Put them in a vertical sizer, with ratio 3 units for the text entry, 5 for button -- and padding of 6 pixels. sizerTop = wx.wxBoxSizer(wx.wxVERTICAL) sizerTop:AddWindow(textEntry, 3, wx.wxGROW + wx.wxALL, 6) sizerTop:AddWindow(button, 5, wx.wxGROW + wx.wxALL, 6) -- Set up the frame to use that sizer to move/resize its children controls frame:SetAutoLayout(wx.TRUE) frame:SetSizer(sizerTop) -- Optional - these will set an initial minimal size, just enough to hold the -- controls (more useful for dialogs than a frame) --sizerTop.SetSizeHints(frame) --sizerTop.Fit(frame) -- Start the application wx.wxGetBaseApp():SetTopWindow(frame) frame:Show(wx.TRUE) --- NEW FILE: debug.wx.lua --- -------------------------------------------------------------------------=--- -- Name: debug.wx.lua -- Purpose: 'Scribble' wxLua sample with debugging tests -- Author: J Winwood -- Copyright: (c) 2002 Lomtick Software. All rights reserved. -- Licence: wxWindows licence -------------------------------------------------------------------------=--- frame = nil mouseDown = nil pointsList = {} itemColour = 1 running = 1 isModified = nil redrawRequired = 1 fileName = "" local wxID_DEBUG = wx.wxID_HIGHEST + 1 local wxID_NOPROMPT = wx.wxID_HIGHEST + 2 function causeError() -- local table = {} local number = 3.1415926 local string = "string" local userdata = wx.wxObject() table["a"] = 1 table[2] = "a" table[3] = {} table[4] = table table["b"] = {} table.n = 5 -- wx.value = 1 -- check this causes a run-time error -- @fileName = 1 -- test calling derived method calling local results = {} userdata.GetClassInfo = function(self) results.refData3 = self:base_GetClassInfo() return 1 end results.refData1 = userdata:GetClassInfo() results.refData2 = userdata:base_GetClassInfo() wxLuaStackDialog() end function main() local penColours = { "Red", "Orange", "Yellow", "Green", "Blue", "Purple", "Black", "Grey" } local pens = {} local screenWidth, screenHeight = wx.wxDisplaySize() local bitmap = wx.wxEmptyBitmap(screenWidth, screenHeight) local bitmapDC = wx.wxMemoryDC() local app = wx.wxGetBaseApp() app:SetVendorName("Lomtick Software") app:SetAppName("Debug") local config = wx.wxConfigGet() config:SetRecordDefaults() for idx = 1, 8 do pens[idx] = wx.wxPenFromColourName(penColours[idx], 3, wx.wxSOLID) end bitmapDC:SelectObject( bitmap ) frame = wx.wxFrame( wx.wxNull, -1, "Scribble Demo (with debugging support)", wx.wxPoint(-1, -1), wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) function DrawPoints(drawDC) for listIndex = 1, table.getn(pointsList) do local listValue = pointsList[listIndex] local lastX, lastY local penIndex = listValue.penColour; drawDC:SetPen(pens[penIndex]) for pointsIndex = 1, table.getn(listValue) do local pointsValue = listValue[pointsIndex] if pointsIndex > 1 then drawDC:DrawLine(lastX, lastY, pointsValue.x, pointsValue.y) end lastX, lastY = pointsValue.x, pointsValue.y end drawDC:SetPen(wx.wxNullPen) end end function Paint(event) if redrawRequired then if running then bitmapDC:Clear() DrawPoints(bitmapDC) end redrawRequired = nil end local dc = wx.wxPaintDC(frame) dc:BeginDrawing() if running then dc:Blit(0, 0, screenWidth, screenHeight, bitmapDC, 0, 0) end dc:EndDrawing() dc:Delete() end frame:ConnectEvent(wx.wxEVT_PAINT, Paint) frame:ConnectEvent(wx.wxEVT_ERASE_BACKGROUND, function(event) end) function OnLeftDown(event) local pointItem = {} pointItem.penColour = itemColour frame:SetStatusText(penColours[itemColour], 1) itemColour = itemColour + 1 if penColours[itemColour] == nil then itemColour = 1 end local points = {} points.x = event:GetX() points.y = event:GetY() pointItem.n = 1 pointItem[1] = points table.insert(pointsList, pointItem) frame:CaptureMouse() mouseDown = 1 isModified = 1 redrawRequired = 1 frame:Refresh() end function OnLeftUp(event) if mouseDown then local points = {} points.x = event:GetX() points.y = event:GetY() table.insert(pointsList[table.getn(pointsList)], points) frame:ReleaseMouse() mouseDown = nil redrawRequired = 1 frame:Refresh() end end function OnMotion(event) if mouseDown then local points = {} points.x = event:GetX() points.y = event:GetY() table.insert(pointsList[table.getn(pointsList)], points) redrawRequired = 1 frame:Refresh() end end frame:ConnectEvent(-1, wx.wxEVT_LEFT_DOWN, OnLeftDown ) frame:ConnectEvent(-1, wx.wxEVT_LEFT_UP, OnLeftUp ) frame:ConnectEvent(-1, wx.wxEVT_MOTION, OnMotion ) function QuerySaveChanges() local dialog = wx.wxMessageDialog( frame, "Document has changed. Do you wish to save the changes?", "Save Changes?", wx.wxYES_NO + wx.wxCANCEL + wx.wxCENTRE + wx.wxICON_QUESTION ) local result = dialog:ShowModal() dialog:Destroy() return result end function LoadScribbles() pointsList = {} return ((pcall(dofile, fileName)) ~= nil) end -- modified from the lua sample save.lua function savevar (n, v) if v ~= nil then io.write(n, "=") if type(v) == "string" then io.write(format("%q", v)) elseif type(v) == "table" then io.write("{}\n") for r,f in v do if type(r) == 'string' then savevar(n.."."..r, f) else savevar(n.."["..r.."]", f) end end else io.write(tostring(v)) end io.write("\n") end end function SaveScribbles() io.output(fileName) savevar("pointsList", pointsList) io.output() return 1 end function Open() local result = nil local fileDialog = wx.wxFileDialog(frame, "Open file", "", "", "Scribble files(*.scribble)|*.scribble", wx.wxOPEN) if fileDialog:ShowModal() == wx.wxID_OK then fileName = fileDialog:GetPath() result = LoadScribbles() if result then frame:SetTitle("Scribble Demo - " .. fileName) end end fileDialog:Destroy() return result end function SaveAs() local fileDialog = wx.wxFileDialog(frame) fileDialog:SetMessage("Save file as") fileDialog:SetStyle(wx.wxSAVE) fileDialog:SetWildcard("Scribble files(*.scribble)|*.scribble") if fileDialog:ShowModal() == wx.wxID_OK then fileName = fileDialog:GetPath() result = SaveScribbles() if result then frame:SetTitle("Scribble Demo - " .. fileName) end end fileDialog:Destroy() return result end function SaveChanges() local isOKToContinue if fileName == "" then isOKToContinue = SaveAs() else isOKToContinue = SaveScribbles() end return isOKToContinue end local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_NEW, "&New", "Begin a new drawing") fileMenu:Append(wx.wxID_OPEN, "&Open", "Open an existing drawing") fileMenu:Append(wx.wxID_SAVE, "&Save", "Save the drawing") fileMenu:Append(wx.wxID_SAVEAS, "Save &As", "Save the drawing to a new file") fileMenu:AppendSeparator() fileMenu:Append(wxID_DEBUG, "&Debug", "Cause Debug Event") fileMenu:AppendSeparator() fileMenu:Append(wx.wxID_EXIT, "&Exit", "Quit the program") local configMenu = wx.wxMenu() configMenu:Append(wxID_NOPROMPT, "&Config", "Toggle MessageBox") local helpMenu = wx.wxMenu() helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Minimal Application") local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(configMenu, "&Options") menuBar:Append(helpMenu, "&Help") frame:SetMenuBar(menuBar) frame:CreateStatusBar(2) frame:SetStatusText("Welcome to wxLua.") frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(wx.TRUE) end ) frame:ConnectEvent(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isOKToContinue = 1 if isModified then local response = QuerySaveChanges() if response == wx.wxID_YES then isOKToContinue = SaveChanges() elseif response == wx.wxID_CANCEL then isOKToContinue = nil end end if isOKToContinue then fileName = "" frame:SetTitle( "Scribble Demo") pointsList = {} redrawRequired = 1 frame:Refresh() isModified = nil end end ) frame:ConnectEvent(wx.wxID_OPEN, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isOKToContinue = 1 if isModified then local response = QuerySaveChanges() if response == wx.wxID_YES then isOKToContinue = SaveChanges() elseif response == wx.wxID_CANCEL then isOKToContinue = nil end end if isOKToContinue then Open() redrawRequired = 1 frame:Refresh() isModified = nil end end ) frame:ConnectEvent(wx.wxID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isSaved if fileName == "" then isSaved = SaveAs() else isSaved = SaveScribbles() end if isSaved then isModified = nil end end ) frame:ConnectEvent(wx.wxID_SAVEAS, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isSaved = SaveAs() if isSaved then isModified = nil end end ) frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the Scribble wxLua Sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame ) end ) frame:ConnectEvent(wxID_NOPROMPT, wx.wxEVT_UPDATE_UI, function ( event ) end) frame:ConnectEvent(wxID_NOPROMPT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) if config:ReadInt("/Controls/Check", 1) == 1 then config:WriteInt("/Controls/Check", 0) else config:WriteInt("/Controls/Check", 1) end end ) frame:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, function (event) local isOkToClose = 1 if isModified then local dialog = wx.wxMessageDialog( frame, "Save changes before exiting?", "Save Changes?", wx.wxYES_NO + wx.wxCENTRE + wx.wxICON_QUESTION ) local result = dialog:ShowModal() dialog:Destroy() if result == wx.wxID_YES then isOkToClose = SaveChanges() end end if isOkToClose then -- prevent paint events using the bitmapDC after we -- have deleted them running = nil bitmapDC:SelectObject(wx.wxNullBitmap) bitmapDC:Delete() bitmap:Delete() local x, y, w, h w, h = frame:GetClientSize() x, y = frame:GetPosition() config:WriteInt("/MainFrame/x", x) config:WriteInt("/MainFrame/y", y) config:WriteInt("/MainFrame/w", w) config:WriteInt("/MainFrame/h", h) config:Set():Destroy() -- ensure the event is passed on so -- that it is handled event:Skip() end end ) frame:ConnectEvent(wxID_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) causeError() end) if config:ReadInt("/Controls/Check", 1) == 1 then wx.wxMessageBox([[You can disable this message box by unchecking the checkbox in the main window (of course, a real program would have a checkbox right here but we keep it simple)]], "Welcome to Debug demo", wx.wxICON_INFORMATION + wx.wxOK) end config:SetPath("/MainFrame") local x, y, w, h x = config:ReadInt("x", 50) y = config:ReadInt("y", 50) w = config:ReadInt("w", 350) h = config:ReadInt("h", 200) frame:Move(x, y) frame:SetClientSizeWH(w, h) config:SetPath("/") frame:Show(wx.TRUE) end main() --fred() --- NEW FILE: mdi.wx.lua --- ----------------------------------------------------------------------------- -- Name: mdi.wx.lua -- Purpose: 'Mdi' wxLua sample -- Author: J Winwood -- Modified by: -- Created: 16/11/2001 -- RCS-ID: $Id: mdi.wx.lua,v 1.1 2005/06/07 05:37:45 jrl1 Exp $ -- Copyright: (c) 2001 Lomtick Software. All rights reserved. -- Licence: wxWindows licence ----------------------------------------------------------------------------- childList = {} numChildren = 0 function main() local frame = wx.wxMDIParentFrame( wx.wxNull, -1, "MDI Demo", wx.wxPoint(-1, -1), wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) function CreateChild() local child = wx.wxMDIChildFrame( frame, -1, "" ) child:SetSize(330,340) childList[child:GetId()] = child numChildren = numChildren + 1 child:SetTitle("Child "..numChildren) function Paint(event) local dc = wx.wxPaintDC(childList[event:GetId()]) dc:DrawRectangle(10, 10, 300, 300); dc:DrawRoundedRectangle(20, 20, 280, 280, 20); dc:DrawEllipse(30, 30, 260, 260); dc:DrawText("A test string", 50, 150); dc:Delete() end child:ConnectEvent(wx.wxEVT_PAINT, Paint) end local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_NEW, "&New", "Create a new child window") fileMenu:Append(wx.wxID_EXIT, "&Exit", "Quit the program") local helpMenu = wx.wxMenu() helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua MDI Application") local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") frame:SetMenuBar(menuBar) frame:CreateStatusBar(1) frame:SetStatusText("Welcome to wxLua.") frame:ConnectEvent(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) CreateChild() end ) frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close() end ) frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the MDI wxLua sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame ) end ) frame:Show(wx.TRUE) end main() --- NEW FILE: fldemo.wx.lua --- ----------------------------------------------------------------------------- -- Name: FLDemo.wx.lua -- Purpose: 'FL' wxLua sample -- Author: J Winwood -- Modified by: -- Created: -- RCS-ID: -- Copyright: (c) 2002 J Winwood. All rights reserved. -- Licence: wxWindows licence ----------------------------------------------------------------------------- frame = nil function CreateTextCtrl(name) local textctrl = wx.wxTextCtrl(frame, -1, name, wx.wxDefaultPosition, wx.wxSize(0,0), wx.wxTE_MULTILINE) textctrl:SetBackgroundColour(wx.wxColour(192,192,192)) return textctrl end function main() -- return the path part of the currently executing file local strAt = string.byte('@') function getPath() function findLast(filePath) local lastOffset = nil local offset repeat offset = string.find(filePath, "\\") if offset == nil then offset = string.find(filePath, "/") end if offset then if not lastOffset then lastOffset = offset else lastOffset = lastOffset + offset end filePath = string.sub(filePath, offset + 1) end until not offset return lastOffset end local filePath = debug.getinfo(1, "S").source if string.byte(filePath) == strAt then local offset = findLast(filePath) if offset ~= nil then -- remove the @ at the front up to just before the path separator filePath = string.sub(filePath, 2, offset - 1) else filePath = "." end else filePath = wx.wxGetCwd().."/Examples" end return filePath end local bitmapPath = getPath().."/bitmaps/" newBitmap = wx.wxBitmapFromFile(bitmapPath.."new.bmp", wx.wxBITMAP_TYPE_BMP) openBitmap = wx.wxBitmapFromFile(bitmapPath.."open.bmp", wx.wxBITMAP_TYPE_BMP) saveBitmap = wx.wxBitmapFromFile(bitmapPath.."save.bmp", wx.wxBITMAP_TYPE_BMP) saveAllBitmap = wx.wxBitmapFromFile(bitmapPath.."saveall.bmp", wx.wxBITMAP_TYPE_BMP) cutBitmap = wx.wxBitmapFromFile(bitmapPath.."cut.bmp", wx.wxBITMAP_TYPE_BMP) copyBitmap = wx.wxBitmapFromFile(bitmapPath.."copy.bmp", wx.wxBITMAP_TYPE_BMP) pasteBitmap = wx.wxBitmapFromFile(bitmapPath.."paste.bmp", wx.wxBITMAP_TYPE_BMP) helpBitmap = wx.wxBitmapFromFile(bitmapPath.."help.bmp", wx.wxBITMAP_TYPE_BMP) -- create the frame window frame = wx.wxFrame( wx.wxNull, -1, "FL Demo", wx.wxPoint(-1, -1), wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) client = CreateTextCtrl("Client") layout = wx.wxFrameLayout(frame, client) if wx.wxPlatformGTK then local props = layout:GetPaneProperties() props:SetRealTimeUpdates(wx.FALSE) layout:SetPaneProperties(props, wx.wxALL_PANES) end layout:SetUpdatesManager(wx.cbGCUpdatesMgrDefault()) local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_EXIT, "&Exit", "Quit the program") local helpMenu = wx.wxMenu() helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua FL Demo Application") local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") frame:SetMenuBar(menuBar) frame:CreateStatusBar(1) frame:SetStatusText("Welcome to wxLua.") frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(TRUE) end ) frame:ConnectEvent( wx.wxEVT_CLOSE_WINDOW, function ( event ) event:Skip() layout:Delete() layout = nil end) frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the FL Demo wxLua sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame ) end ) layout:PushDefaultPlugins() layout:AddPlugin(wx.wxClassInfo("cbBarHintsPlugin")) layout:AddPlugin(wx.wxClassInfo("cbHintAnimationPlugin")) -- layout:AddPlugin(wx.wxClassInfo("cbRowDragPlugin")) layout:AddPlugin(wx.wxClassInfo("cbAntiflickerPlugin")) layout:AddPlugin(wx.wxClassInfo("cbSimpleCustomizationPlugin")) local sizes0 = wx.cbDimInfo(200, 45, 200, 85, 175, 35, wx.FALSE, 4, 4) local sizes1 = wx.cbDimInfo(150, 35, 150, 85, 175, 35, wx.TRUE, 4, 4) local sizes2 = wx.cbDimInfo(195, 32, 185, 32, 195, 35, wx.TRUE, 4, 4, wx.cbDynToolBarDimHandler()) toolBar = wx.wxDynamicToolBar(frame, -1) toolBar:AddTool(wx.wxID_NEW, newBitmap) toolBar:AddTool(wx.wxID_OPEN, openBitmap) toolBar:AddTool(wx.wxID_SAVE, saveBitmap) toolBar:AddSeparator() toolBar:AddTool(wx.wxID_CUT, cutBitmap) toolBar:AddTool(wx.wxID_COPY, copyBitmap) toolBar:AddTool(wx.wxID_PASTE, pasteBitmap) toolBar:AddSeparator() toolBar:AddTool(wx.wxID_ABOUT, helpBitmap) layout:AddBar(toolBar, sizes2, wx.FL_ALIGN_TOP, 0, 0, "First Toolbar", wx.FALSE) layout:AddBar(CreateTextCtrl("Third"), sizes1, wx.FL_ALIGN_TOP, 1, 0, "Second Toolbar", wx.TRUE) layout:AddBar(CreateTextCtrl("Second"), sizes0, wx.FL_ALIGN_TOP, 1, 0, "Second View", wx.TRUE) layout:AddBar(CreateTextCtrl("First"), sizes0, wx.FL_ALIGN_TOP, 1, 0, "First View", wx.TRUE) layout:EnableFloating(wx.TRUE) frame:Show(wx.TRUE) end main() --- NEW FILE: debugtest.wx.lua --- -- return the path part of the currently executing file local strAt = string.byte('@') function getPath() function findLast(filePath) local lastOffset = nil local offset repeat offset = string.find(filePath, "\\") if offset == nil then offset = string.find(filePath, "/") end if offset then if not lastOffset then lastOffset = offset else lastOffset = lastOffset + offset end filePath = string.sub(filePath, offset + 1) end until not offset return lastOffset end local filePath = debug.getinfo(1, "S").source if string.byte(filePath) == strAt then local offset = findLast(filePath) if offset ~= nil then -- remove the @ at the front up to just before the path separator filePath = string.sub(filePath, 2, offset - 1) else filePath = "." end else filePath = wx.wxGetCwd().."/Examples" end return filePath end dofile (getPath().."/Minimal.wx.lua") --- NEW FILE: veryminimal.wx.lua --- ----------------------------------------------------------------------------- -- Name: minimal.wx.lua -- Purpose: 'Minimal' wxLua sample -- Author: J Winwood -- Modified by: -- Created: 16/11/2001 -- RCS-ID: $Id: veryminimal.wx.lua,v 1.1 2005/06/07 05:37:45 jrl1 Exp $ -- Copyright: (c) 2001 J Winwood. All rights reserved. -- Licence: wxWindows licence ----------------------------------------------------------------------------- frame = nil function main() -- create the frame window frame = wx.wxFrame( wx.wxNull, -1, "Minimal Demo", wx.wxPoint(-1, -1), wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) -- show the frame window frame:Show(wx.TRUE) end main() --- NEW FILE: tree.wx.lua --- function main() frame = wx.wxFrame( wx.wxNull, -1, "Tree Demo", wx.wxDefaultPosition, wx.wxSize(450, 400), wx.wxDEFAULT_FRAME_STYLE ) tree = wx.wxTreeCtrl( frame, -1, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTR_LINES_AT_ROOT + wx.wxTR_HAS_BUTTONS ) local ifr = tree:AddRoot( "Root" ) print("root value", ifr:GetValue(), "\n") local ifw = tree:GetRootItem(); print("root value", ifw:GetValue(), "\n") for idx = 0, 10 do ir = tree:AppendItem( ifr, "Parent ("..idx..")" ) for jdx = 0, 5 do tree:AppendItem( ir, "Child ("..idx..", "..jdx..")" ) end if (idx == 2) or (idx == 5) then tree:Expand(ir) end end local ifw = tree:GetRootItem(); print("root value", ifw:GetValue(), "\n") tree:ConnectEvent( wx.wxEVT_COMMAND_TREE_ITEM_EXPANDING, function( event ) local selNode = event:GetItem() print("Item:", selNode:GetValue(), "\n") end ) tree:Expand(ifr) wx.wxGetBaseApp():SetTopWindow(frame) frame:Show(wx.TRUE) end main() --- NEW FILE: htmlwin.wx.lua --- -------------------------------------------------------------------------=--- -- Name: HtmlWindow.wx.lua -- Purpose: HtmlWindow wxLua sample -- Author: J Winwood -- Created: May 2002 -- Copyright: (c) 2002 Lomtick Software. All rights reserved. -- Licence: wxWindows licence -------------------------------------------------------------------------=--- frame = nil html = nil htmlTextPage = [[<html> <head> <title>Bound Widget demonstration</title> </head> <body> <h3>wxHtmlWidgetCell demonstration</h3> There are three bound widgets below. <hr> <center> <lua text="first widget" x=100 y=70> </center> <hr> <lua text="small widget" x=60 y=50> <hr> <lua text="widget with floating width" float=y x=70 y=40> </body> </html>]] function main() -- create the frame window frame = wx.wxFrame( wx.wxNull, -1, "HtmlWindow Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) -- create a simple file menu local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_PREVIEW, "Print Pre&view", "Preview the HTML document") fileMenu:Append(wx.wxID_PRINT, "&Print", "Print the HTML document") fileMenu:Append(wx.wxID_EXIT, "&Exit", "Quit the program") -- create a simple help menu local helpMenu = wx.wxMenu() helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Minimal Application") -- create a menu bar and append the file and help menus local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") -- insert the menu bar into the frame frame.MenuBar = menuBar -- create a simple status bar frame:CreateStatusBar(2) frame:SetStatusText("Welcome to wxLua.") frame:ConnectEvent(wx.wxID_PREVIEW, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) printing:PreviewText(htmlTextPage) end ) frame:ConnectEvent(wx.wxID_PRINT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) printing:PrintText(htmlTextPage) end ) -- connect the selection event of the exit menu item to an -- event handler that closes the window frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(TRUE) end ) -- connect the selection event of the about menu item frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the HtmlWindow wxLua sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame ) end) -- create the html window html = wx.wxLuaHtmlWindow(frame) html.OnSetTitle = function(self, title) frame.Title = frame.Title.." - "..title end -- when a lua custom tag is parsed in the html, this event handler -- will be invoked wx.wxGetBaseApp():ConnectEvent(-1, wx.wxEVT_HTML_TAG_HANDLER, function (event) CreateBoundWindow(event) end) -- set the frame window and status bar html:SetRelatedFrame(frame, "HtmlWindow wxLua Sample : %s") html:SetRelatedStatusBar(1) -- load the document html:SetPage(htmlTextPage) -- html:LoadPage("testpage.html") -- show the frame window wx.wxGetBaseApp().TopWindow = frame frame:Show(wx.TRUE) end function CreateBoundWindow(event) local ax, ay local rc, fl = 0 -- parse the X parameter in the custom lua tag rc, ax = event.HtmlTag:GetParamAsInt("X") -- parse the Y parameter ay = event.HtmlTag:GetParam("Y") -- if there is a float tag set the float if event.HtmlTag:HasParam("FLOAT") == wx.TRUE then fl = ax end -- create the control to embed local parent = event.HtmlParser.Window if parent then local wnd = wx.wxTextCtrl( parent, -1, event.HtmlTag:GetParam("TEXT"), wx.wxPoint(0, 0), wx.wxSize(ax, ay), wx.wxTE_MULTILINE ) -- show the control wnd:Show(wx.TRUE) -- create the container widget cell local widget = wx.wxHtmlWidgetCell(wnd, fl) -- insert the cell into the document event.HtmlParser:OpenContainer():InsertCell(widget) event:SetParseInnerCalled(wx.FALSE) end end main() --- NEW FILE: dialog.wx.lua --- -------------------------------------------------------------------------=--- -- Name: Dialog.wx.lua -- Purpose: Dialog wxLua sample -- Based on the C++ version by Marco Ghislanzoni -- Author: J Winwood -- Created: March 2002 -- Copyright: (c) 2001 Lomtick Software. All rights reserved. -- Licence: wxWindows licence -------------------------------------------------------------------------=--- -- IDs of the controls in the dialog local Dialog_CelsiusToFahrenheit = 1 local Dialog_FahrenheitToCelsius = 2 local Dialog_About = 3 local Dialog_Close = 4 local Dialog_CelsiusDegrees = 5 local Dialog_FahrenheitDegrees = 6 local Dialog_CelsiusText = 7 local Dialog_FahrenheitText = 8 local Dialog_StaticBox = 9 -- Create the dialog local dialog = wx.wxDialog(wx.wxNull, -1, "Temperature Converter", wx.wxPoint(0, 0), wx.wxSize(147, 162)) -- Create the controls local statBox = wx.wxStaticBox (dialog, Dialog_StaticBox, "Convert", wx.wxPoint(5, 0), wx.wxSize(130, 100)) local celsiusText = wx.wxStaticText(dialog, Dialog_CelsiusText, "Celsius:", wx.wxPoint(10, 15)) local celsiusDegree = wx.wxTextCtrl (dialog, Dialog_CelsiusDegree, nil, wx.wxPoint(10, 30), wx.wxSize(50, 20)) local fahrenheitText = wx.wxStaticText(dialog, Dialog_FahrenheitText, "Fahrenheit:", wx.wxPoint(10, 55)) local fahrenheitDegree = wx.wxTextCtrl (dialog, Dialog_FahrenheitDegree, nil, wx.wxPoint(10, 70), wx.wxSize(50, 20)) local btnCelsiusToFahrenheit = wx.wxButton (dialog, Dialog_CelsiusToFahrenheit, "C -> F", wx.wxPoint(80, 30), wx.wxSize(50, 20)) local btnFahrenheitToCelsius = wx.wxButton (dialog, Dialog_FahrenheitToCelsius, "F -> C", wx.wxPoint(80, 70), wx.wxSize(50, 20)) local btnAbout = wx.wxButton (dialog, Dialog_About, "About", wx.wxPoint(10, 110), wx.wxSize(50, 20)) local btnClose = wx.wxButton (dialog, Dialog_Close, "Close", wx.wxPoint(80, 110), wx.wxSize(50, 20)) -- Attach an event handler to the CelsiusToFahrenheit button dialog:ConnectEvent(Dialog_CelsiusToFahrenheit, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) local celsiusString = celsiusDegree:GetValue() if celsiusString == "" then wx.wxMessageBox("The Celsius entry is invalid", "Error!", wx.wxOK + wx.wxICON_EXCLAMATION + wx.wxCENTRE, dialog) else local fahrenheitValue = (tonumber(celsiusString) * 9 / 5) + 32 fahrenheitDegree:SetValue(fahrenheitValue) end end) -- Attach an event handler to the FahrenheitToCelsius button dialog:ConnectEvent(Dialog_FahrenheitToCelsius, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) local fahrenheitString = fahrenheitDegree:GetValue() if fahrenheitString == "" then wx.wxMessageBox("The fahrenheit entry is invalid!", "Error!", wx.wxOK + wx.wxICON_EXCLAMATION + wx.wxCENTRE, dialog) else local celsiusValue = (tonumber(fahrenheitString) - 32) * 5 / 9 celsiusDegree:SetValue(celsiusValue) end end) -- Attach an event handler to the Close button dialog:ConnectEvent(Dialog_Close, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) dialog:Destroy() end) dialog:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, function (event) dialog:Destroy() event:Skip() end) -- Attach an event handler to the About button dialog:ConnectEvent(Dialog_About, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) wx.wxMessageBox("Based on the C++ version by Marco Ghislanzoni", "Temperature converter", wx.wxOK + wx.wxICON_INFORMATION, dialog) end) -- Centre the dialog on the screen dialog:Centre() -- Show the dialog dialog:Show(wx.TRUE) --- NEW FILE: editor.wx.lua --- -------------------------------------------------------------------------=--- -- Name: Editor.wx.lua -- Purpose: wxLua IDE -- Author: J Winwood -- Created: March 2002 -- Copyright: (c) 2002-5 Lomtick Software. All rights reserved. -- Licence: wxWindows licence -------------------------------------------------------------------------=--- local wxID_REDO = wx.wxID_HIGHEST + 1 local wxID_SELECTALL = wx.wxID_HIGHEST + 2 local wxID_FINDNEXT = wx.wxID_HIGHEST + 3 local wxID_FINDPREV = wx.wxID_HIGHEST + 4 local wxID_REPLACE = wx.wxID_HIGHEST + 5 local wxID_GOTOLINE = wx.wxID_HIGHEST + 6 local wxID_TOGGLEBREAKPOINT = wx.wxID_HIGHEST + 7 local wxID_COMPILE = wx.wxID_HIGHEST + 8 local wxID_RUN = wx.wxID_HIGHEST + 9 local wxID_ATTACH_DEBUG = wx.wxID_HIGHEST + 10 [...2039 lines suppressed...] if args then local fileLoaded programName = args[0] for index, fileName in args do if index ~= "n" and index ~= 0 then loadFile(fileName, fileName) fileLoaded = 1 end if notebook:GetPageCount() > 0 then notebook:SetSelection(0) end end if not fileLoaded then local editor = createEditor("Untitled") setupKeywords(editor, 1) end end frame:SetIcon(wxLuaEditorIcon) --- NEW FILE: grid.wx.lua --- ----------------------------------------------------------------------------- -- Name: Grid.wx.lua -- Purpose: 'Grid' wxLua sample -- Author: J Winwood -- Created: January 2002 -- Copyright: (c) 2002 Lomtick Software. All rights reserved. -- Licence: wxWindows licence ----------------------------------------------------------------------------- function main() local frame = wx.wxFrame(wx.wxNull, -1, "Testing wxGrid", wx.wxPoint(25, 25), wx.wxSize(350, 250)) local fileMenu = wx.wxMenu("", wxMENU_TEAROFF) fileMenu:Append(wx.wxID_EXIT, "&Exit\tCtrl-X", "Quit the program") local helpMenu = wx.wxMenu("", wxMENU_TEAROFF) helpMenu:Append(wx.wxID_ABOUT, "&About\tCtrl-A", "About the Grid wxLua Application") local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") frame:SetMenuBar(menuBar) frame:CreateStatusBar(1) frame:SetStatusText("Welcome to wxLua.") frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close() end ) frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the Grid wxLua sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame ) end ) local grid = wx.wxGrid(frame, -1) grid:CreateGrid(10, 8) grid:SetColSize(3, 200) grid:SetRowSize(4, 45) grid:SetCellValue(0, 0, "First cell") grid:SetCellValue(1, 1, "Another cell") grid:SetCellValue(2, 2, "Yet another cell") grid:SetCellFont(0, 0, wx.wxFont(10, wx.wxROMAN, wx.wxITALIC, wx.wxNORMAL)) grid:SetCellTextColour(1, 1, wx.wxRED) grid:SetCellBackgroundColour(2, 2, wx.wxCYAN) frame:Show(wx.TRUE) end main() --- NEW FILE: choices.wx.lua --- function main() local frame = wx.wxFrame(wx.wxNull, -1, "Choices", wx.wxPoint(20, 20), wx.wxSize(450, 350)) panel = wx.wxPanel(frame, -1) local n = wx.wxNotebook(panel, -1, wx.wxPoint(10,10), wx.wxSize(410, 300), wx.wxNB_BOTTOM ) local choices = {"one", "two", "three", "four"} local p1 = wx.wxPanel(n, -1) n:AddPage(p1, "wxRadioBox and wxListBox") local b1 = wx.wxRadioBox(p1, -1, "Choice 1", wx.wxPoint(10,10), wx.wxSize(370, 100), choices, 1, wx.wxRA_SPECIFY_ROWS) local l1 = wx.wxListBox(p1, -1, wx.wxPoint(10,120), wx.wxSize(370, 100), choices) local p2 = wx.wxPanel(n, -1) n:AddPage(p2, "wxRadioBox and wxComboBox") local b2 = wx.wxRadioBox(p2, -1, "Choice 2", wx.wxPoint(10,10), wx.wxSize(370, 100), choices, 1, wx.wxRA_SPECIFY_COLS) local l2 = wx.wxComboBox(p2, -1, "three", wx.wxPoint(10,120), wx.wxSize(370, 100), choices) local p3 = wx.wxPanel(n, -1) n:AddPage(p3, "extra") local b3 = wx.wxRadioBox(p3, -1, "Choice 1", wx.wxPoint(10,10), wx.wxSize(370, 100), choices, 1, wx.wxRA_SPECIFY_ROWS) print("b3 - metatable before destruction", getmetatable(b3)) b3:Destroy() print("b3 - metatable after destruction", getmetatable(b3)) wx.wxGetBaseApp():SetTopWindow(frame) frame:Show(wx.TRUE) end main() --- NEW FILE: printing.wx.lua --- ----------------------------------------------------------------------------- -- Name: printing.wx.lua -- Purpose: 'Printing' wxLua sample -- Author: J Winwood -- Modified by: -- Created: 4/7/2002 -- Modified -- RCS-ID: $Id: printing.wx.lua,v 1.1 2005/06/07 05:37:45 jrl1 Exp $ -- Copyright: (c) 2002 J Winwood. All rights reserved. -- Licence: wxWindows licence ----------------------------------------------------------------------------- local wxID_PRINT = wx.wxID_HIGHEST + 1 local wxID_PRINTPREVIEW = wx.wxID_HIGHEST + 2 local wxID_PRINTSETUP = wx.wxID_HIGHEST + 3 local wxID_PAGESETUP = wx.wxID_HIGHEST + 4 frame = nil printData = wx.wxPrintData() pageSetupData = wx.wxPageSetupDialogData() function DisplayFigure(dc, pageNumber) -- call some drawing functions dc:DrawRectangle(10, 10, 300, 300) dc:DrawRoundedRectangle(20, 20, 280, 280, 20) dc:DrawEllipse(30, 30, 260, 260) if pageNumber then dc:DrawText("Test page "..pageNumber, 50, 150) else dc:DrawText("A test string", 50, 150) end end function ConnectPrintEvents(printOut) printOut:SetPageInfo(1, 16, 2, 15) printOut.HasPage = function(self, pageNum) return wx.TRUE end printOut.GetPageInfo = function(self) return 1, 6, 2, 5 end printOut.OnBeginDocument = function(self, startPage, endPage) return self:base_OnBeginDocument(startPage, endPage) end printOut.OnEndDocument = function(self) end printOut.OnBeginPrinting = function(self) end printOut.OnEndPrinting = function(self) end printOut.OnPreparePrinting = function(self) end printOut.OnPrintPage = function(self, pageNum) local dc = self:GetDC() -- Marcos modified init local ppiScreenX, ppiScreenY = self:GetPPIScreen() local ppiPrinterX, ppiPrinterY = self:GetPPIPrinter() local scale = ppiPrinterX/ppiScreenX local w, h = dc:GetSize() local a ,b = self:GetPageSizeMM() local pageWidth, pageHeight = self:GetPageSizePixels() local overallScale = (scale * ( w / pageWidth)) -- print( 'dc:GetUserScale-->'..dc:GetUserScale()) -- print(string.format('ppiScreenX %s, ppiScreenY %s', ppiScreenX, ppiScreenY)) -- print(string.format("ppiPrinterX %s, ppiPrinterY %s", ppiPrinterX, ppiPrinterY)) -- print(string.format("printOut:GetPageSizeMM--> a %s, b %s dc:GetSize-->w %s, h %s, printOut:GetPageSizePixels--> pageWidth %s, pageHeight %s", a, b, w, h, pageWidth, pageHeight )) dc:SetUserScale(overallScale, overallScale) -- print('overallScale '..overallScale, 'GetUserScale '..dc:GetUserScale()) -- Marcos modified end DisplayFigure(dc, pageNum) return wx.TRUE end end function Print() local printDialogData = wx.wxPrintDialogDataFromPrintData(printData) local printer = wx.wxPrinter(printDialogData) local printout = wx.wxLuaPrintout("Test Print") ConnectPrintEvents(printout) if printer:Print(frame, printout, wx.TRUE) == wx.FALSE then if printer:GetLastError() == wx.wxPRINTER_ERROR then wx.wxMessageBox("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing.wx.lua", wx.wxOK) else wx.wxMessageBox("You cancelled printing", "Printing.wx.lua", wx.wxOK) end else printData = printer:GetPrintDialogData():GetPrintData():Copy() end end function PrintPreview() local printerPrintout = wx.wxLuaPrintout("Test Print") ConnectPrintEvents(printerPrintout) local previewPrintout = wx.wxLuaPrintout("Test Print Preview") ConnectPrintEvents(previewPrintout) local printDialogData = wx.wxPrintDialogDataFromPrintData(printData):GetPrintData() local preview = wx.wxPrintPreview(printerPrintout, previewPrintout, printDialogData) local result = preview:Ok() if result == wx.FALSE then wx.wxMessageBox("There was a problem previewing.\nPerhaps your current printer is not set correctly?", "Printing.wx.lua", wx.wxOK) else local previewFrame = wx.wxPreviewFrame(preview, frame, "Test Print Preview", wx.wxPoint(100, 100), wx.wxSize(600, 650)) previewFrame:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, function (event) previewFrame:Destroy() event:Skip() end ) previewFrame:Centre(wx.wxBOTH) previewFrame:Initialize() previewFrame:Show(wx.TRUE) end end function PrintSetup() local printDialogData = wx.wxPrintDialogDataFromPrintData(printData) local printerDialog = wx.wxPrintDialog(frame, printDialogData) printerDialog:GetPrintDialogData():SetSetupDialog(wx.TRUE) printerDialog:ShowModal() printData = printerDialog:GetPrintDialogData():GetPrintData():Copy() printerDialog:Destroy() end function PageSetup() printData = pageSetupData:GetPrintData():Copy() local pageSetupDialog = wx.wxPageSetupDialog(frame, pageSetupData) pageSetupDialog:ShowModal() printData = pageSetupDialog:GetPageSetupData():GetPrintData():Copy() pageSetupData = pageSetupDialog:GetPageSetupData():Copy() pageSetupDialog:Destroy() end function main() -- create the frame window frame = wx.wxFrame( wx.wxNull, -1, "Printing Demo", wx.wxPoint(-1, -1), wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) -- paint event handler function Paint(event) -- create the paint DC local dc = wx.wxPaintDC(frame) DisplayFigure(dc) -- the paint DC will be destroyed by the garbage collector, -- however on Windows 9x/Me this may be too late (DC's are precious resource) -- so delete it here dc:Delete() end -- connect the paint event handler with the paint event frame:ConnectEvent(wx.wxEVT_PAINT, Paint) -- create a simple file menu local fileMenu = wx.wxMenu() fileMenu:Append(wxID_PAGESETUP, "Page S&etup", "Set up the page") fileMenu:Append(wxID_PRINTSETUP, "Print &Setup", "Set up the printer") fileMenu:Append(wxID_PRINTPREVIEW, "Print Pre&view", "Preview the test print") fileMenu:Append(wxID_PRINT, "&Print", "Print the test print") fileMenu:Append(wx.wxID_EXIT, "&Exit", "Quit the program") -- create a simple help menu local helpMenu = wx.wxMenu() helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Printing Application") -- create a menu bar and append the file and help menus local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") -- insert the menu bar into the frame frame:SetMenuBar(menuBar) -- create a simple status bar frame:CreateStatusBar(1) frame:SetStatusText("Welcome to wxLua.") frame:ConnectEvent(wxID_PAGESETUP, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) PageSetup() end ) frame:ConnectEvent(wxID_PRINTSETUP, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) PrintSetup() end ) frame:ConnectEvent(wxID_PRINTPREVIEW, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) PrintPreview() end ) frame:ConnectEvent(wxID_PRINT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) Print() end ) -- connect the selection event of the exit menu item to an -- event handler that closes the window frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(TRUE) end ) -- connect the selection event of the about menu item frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the Printing wxLua sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame ) end ) -- show the frame window frame:Show(wx.TRUE) end main() --- NEW FILE: scribble.wx.lua --- -------------------------------------------------------------------------=--- -- Name: scribble.wx.lua -- Purpose: 'Scribble' wxLua sample -- Author: J Winwood -- Modified by: Thanks to Peter Prade and Nick Trout for fixing -- the bug in the for loop in DrawPoints() -- Created: 16/11/2001 -- RCS-ID: $Id: scribble.wx.lua,v 1.1 2005/06/07 05:37:45 jrl1 Exp $ -- Copyright: (c) 2001 J Winwood. All rights reserved. -- Licence: wxWindows licence -------------------------------------------------------------------------=--- frame = nil mouseDown = nil pointsList = {} itemColour = 1 running = 1 isModified = nil redrawRequired = 1 fileName = "" function main() local penColours = { "Red", "Orange", "Yellow", "Green", "Blue", "Purple", "Black", "Grey" } local pens = {} local screenWidth, screenHeight = wx.wxDisplaySize() local bitmap = wx.wxEmptyBitmap(screenWidth, screenHeight) for idx = 1, 8 do pens[idx] = wx.wxPenFromColourName(penColours[idx], 3, wx.wxSOLID) end frame = wx.wxFrame( wx.wxNull, -1, "Scribble Demo", wx.wxPoint(-1, -1), wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) function DrawPoints(drawDC) for listIndex = 1, table.getn(pointsList) do local listValue = pointsList[listIndex] local lastX, lastY drawDC:SetPen(pens[listValue.penColour]) for pointsIndex = 1, table.getn(listValue) do local pointsValue = listValue[pointsIndex] if pointsIndex > 1 then drawDC:DrawLine(lastX, lastY, pointsValue.x, pointsValue.y) end lastX, lastY = pointsValue.x, pointsValue.y end end drawDC:SetPen(wx.wxNullPen) end function Paint(event) local dc = wx.wxPaintDC(frame) dc:BeginDrawing() if redrawRequired then if running then local bitmapDC = wx.wxMemoryDC() bitmapDC:SelectObject( bitmap ) bitmapDC:Clear() DrawPoints(bitmapDC) bitmapDC:SelectObject(wx.wxNullBitmap) bitmapDC:Delete() end redrawRequired = nil end if running then dc:DrawBitmap(bitmap, 0, 0, false) end dc:EndDrawing() dc:Delete() end frame:ConnectEvent(wx.wxEVT_PAINT, Paint) frame:ConnectEvent(wx.wxEVT_... [truncated message content] |
|
From: John L. <jr...@us...> - 2005-06-07 05:36:56
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21029/samples Log Message: Directory /cvsroot/wxlua/wxLua/samples added to the repository |
|
From: John L. <jr...@us...> - 2005-06-07 04:42:58
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28237/wxLua/apps/wxlua/src Modified Files: Makefile Log Message: build lua too Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 7 Jun 2005 04:17:29 -0000 1.1 --- Makefile 7 Jun 2005 04:42:49 -0000 1.2 *************** *** 46,50 **** $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: wxLuaLib wxLuaDebugLib wxLuaSocketLib luawrappers $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) --- 46,50 ---- $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib luawrappers $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) |
