Menu
▾
▴
[Wxlua-commit] wxLua/build/bakefiles wxbindcustom.bkgen,NONE,1.1 Bakefiles.bkgen,1.5,1.6 wxluabase.bkl,1.10,1.11
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:39
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/build/bakefiles Modified Files: Bakefiles.bkgen wxluabase.bkl Added Files: wxbindcustom.bkgen Log Message: Added infrastructure to build custom wxbind --- NEW FILE: wxbindcustom.bkgen --- <?xml version="1.0" ?> <!-- $Id: wxbindcustom.bkgen,v 1.1 2006/02/02 23:02:28 frm Exp $ --> <bakefile-gen> <!-- ================================================================== --> <!-- Input bakefiles --> <!-- ================================================================== --> <input> ../../modules/wxbind/build/wxbindcustom.bkl </input> <!-- required since wxLua bakefiles use wx presets stored in wxWidgets subfolders... --> <add-flags>-I%WXWIN%/build/bakefiles/wxpresets</add-flags> <!-- ================================================================== --> <!-- Formats to (not) generate --> <!-- ================================================================== --> <disable-formats>msvc6prj,dmars,cbx_unix,cbuilderx</disable-formats> <!-- List of output formats to generate: --> <add-formats> borland,dmars,mingw,msvc,watcom,cbuilderx,cbx_unix,gnu </add-formats> <!-- ================================================================== --> <!-- Output directories --> <!-- ================================================================== --> <!-- Directories where msw makefiles should go: --> <add-flags formats="borland">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.bcc</add-flags> <add-flags formats="mingw">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.gcc</add-flags> <add-flags formats="msvc">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.vc</add-flags> <add-flags formats="watcom">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.wat</add-flags> <add-flags formats="gnu">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.gnu</add-flags> </bakefile-gen> Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxluabase.bkl 2 Feb 2006 18:46:43 -0000 1.10 --- wxluabase.bkl 2 Feb 2006 23:02:28 -0000 1.11 *************** *** 179,186 **** <!-- a template for wxLua-based exe/dll targets --> <template id="wxlua" template="wx,wxlua-base"> ! <if cond="TARGETING_WIN32=='1'"> <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> ! <if cond="TARGETING_WIN32=='0'"> <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> --- 179,186 ---- <!-- a template for wxLua-based exe/dll targets --> <template id="wxlua" template="wx,wxlua-base"> ! <if cond="TARGETING_WIN32=='1' or FORMAT=='gnu'"> <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> ! <if cond="TARGETING_WIN32=='0' and FORMAT!='gnu'"> <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Bakefiles.bkgen 25 Jan 2006 18:35:58 -0000 1.5 --- Bakefiles.bkgen 2 Feb 2006 23:02:28 -0000 1.6 *************** *** 14,17 **** --- 14,18 ---- ../../modules/build/bakefiles/modules.bkl ../../util/build/bakefiles/util.bkl + ../../modules/wxbind/build/wxbindcustom.bkl </input> *************** *** 33,36 **** --- 34,43 ---- msvc6prj </del-formats> + <del-formats files="../../modules/wxbind/build/wxbindcustom.bkl"> + msvc6prj,autoconf + </del-formats> + <add-formats files="../../modules/wxbind/build/wxbindcustom.bkl"> + gnu + </add-formats> *************** *** 41,45 **** <!-- Directories where msw makefiles should go: --> ! <add-flags formats="borland" >-o$(INPUT_FILE_DIR)/../msw/makefile.bcc</add-flags> <add-flags formats="mingw">-o$(INPUT_FILE_DIR)/../msw/makefile.gcc</add-flags> <add-flags formats="msvc">-o$(INPUT_FILE_DIR)/../msw/makefile.vc</add-flags> --- 48,52 ---- <!-- Directories where msw makefiles should go: --> ! <add-flags formats="borland">-o$(INPUT_FILE_DIR)/../msw/makefile.bcc</add-flags> <add-flags formats="mingw">-o$(INPUT_FILE_DIR)/../msw/makefile.gcc</add-flags> <add-flags formats="msvc">-o$(INPUT_FILE_DIR)/../msw/makefile.vc</add-flags> |
