Menu
▾
▴
[Wxlua-commit] wxLua/build/msw makefile.bcc,1.4,1.5 makefile.gcc,1.4,1.5 makefile.vc,1.5,1.6 makefile.wat,1.4,1.5
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:45
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefile build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.vc 19 Jun 2005 19:11:06 -0000 1.5 --- makefile.vc 20 Nov 2005 11:35:18 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 26,29 **** --- 26,32 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + # Does the wxLua utilities should be compiled ? [0,1] USE_BIN2C = 1 *************** *** 52,58 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### --- 55,62 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_UTIL="$(USE_UTIL)" \ ! USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.bcc 14 Jun 2005 21:44:40 -0000 1.4 --- makefile.bcc 20 Nov 2005 11:35:18 -0000 1.5 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 75,78 **** --- 75,83 ---- !endif + # Use monolithic build of wxWidgets? [0,1] + !ifndef WX_MONOLITHIC + WX_MONOLITHIC = 0 + !endif + # Does the wxLua utilities should be compiled ? [0,1] !ifndef USE_BIN2C *************** *** 112,117 **** -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ ! -DWX_VERSION="$(WX_VERSION)" -DUSE_BIN2C="$(USE_BIN2C)" \ ! -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_UTIL="$(USE_UTIL)" \ -DUSE_APPS="$(USE_APPS)" --- 117,122 ---- -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ ! -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! -DUSE_BIN2C="$(USE_BIN2C)" -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_UTIL="$(USE_UTIL)" \ -DUSE_APPS="$(USE_APPS)" Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.wat 14 Jun 2005 21:44:40 -0000 1.4 --- makefile.wat 20 Nov 2005 11:35:18 -0000 1.5 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 26,29 **** --- 26,32 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + # Does the wxLua utilities should be compiled ? [0,1] USE_BIN2C = 1 *************** *** 78,84 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" & WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" & ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" --- 81,88 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" & WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & ! USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_UTIL="$(USE_UTIL)" & ! USE_APPS="$(USE_APPS)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.gcc 14 Jun 2005 21:44:40 -0000 1.4 --- makefile.gcc 20 Nov 2005 11:35:18 -0000 1.5 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 26,29 **** --- 26,32 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + # Does the wxLua utilities should be compiled ? [0,1] USE_BIN2C = 1 *************** *** 52,58 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### --- 55,62 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_UTIL="$(USE_UTIL)" \ ! USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### *************** *** 72,75 **** --- 76,80 ---- clean: -if exist .\*.o del .\*.o + -if exist .\*.d del .\*.d $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean *************** *** 92,93 **** --- 97,100 ---- + # Dependencies tracking: + -include ./*.d |
