Menu
▾
▴
[Wxlua-commit] wxLua/build/msw makefile.bcc,1.3,1.4 makefile.gcc,1.3,1.4 makefile.vc,1.3,1.4 makefile.wat,1.3,1.4
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:52
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Fixed modules compilation Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.vc 12 Jun 2005 21:31:38 -0000 1.3 --- makefile.vc 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 11,14 **** --- 11,17 ---- # ------------------------------------------------------------------------- + # The directory where wxWidgets library is installed + WX_DIR = $(WXWIN) + # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 *************** *** 20,23 **** --- 23,44 ---- WX_DEBUG = 1 + # Version of the wx library to build against. + WX_VERSION = 26 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_BIN2C = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + + # Does the wxLua socket support need to be compiled ? [0,1] + USE_WXLUASOCKET = 1 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_UTIL = 1 + + # Does the wxLua applications should be compiled ? [0,1] + USE_APPS = 1 + *************** *** 31,44 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" ### Conditionally set variables: ### ### Targets: ### ! all: utils modules apps clean: --- 52,72 ---- 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: ### + !if "$(USE_UTIL)" == "1" + __utils___depname = utils + !endif + !if "$(USE_APPS)" == "1" + __apps___depname = apps + !endif ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: *************** *** 56,63 **** --- 84,93 ---- cd $(MAKEDIR) + !if "$(USE_UTIL)" == "1" utils: cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) + !endif modules: *************** *** 66,72 **** --- 96,104 ---- cd $(MAKEDIR) + !if "$(USE_APPS)" == "1" apps: cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) + !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.bcc 12 Jun 2005 21:31:38 -0000 1.3 --- makefile.bcc 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 75,81 **** !endif ! # Does the wxLua utilities shoulb be compiled ? [0,1] ! !ifndef USE_UTIL ! USE_UTIL = 1 !endif --- 75,81 ---- !endif ! # Does the wxLua utilities should be compiled ? [0,1] ! !ifndef USE_BIN2C ! USE_BIN2C = 1 !endif *************** *** 90,93 **** --- 90,103 ---- !endif + # Does the wxLua utilities should be compiled ? [0,1] + !ifndef USE_UTIL + USE_UTIL = 1 + !endif + + # Does the wxLua applications should be compiled ? [0,1] + !ifndef USE_APPS + USE_APPS = 1 + !endif + *************** *** 102,116 **** -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ ! -DWX_VERSION="$(WX_VERSION)" -DUSE_UTIL="$(USE_UTIL)" \ -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" ### Conditionally set variables: ### ### Targets: ### ! all: utils modules apps clean: --- 112,133 ---- -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)" ### Conditionally set variables: ### + !if "$(USE_UTIL)" == "1" + __utils___depname = utils + !endif + !if "$(USE_APPS)" == "1" + __apps___depname = apps + !endif ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: *************** *** 131,134 **** --- 148,152 ---- @del apps.bat + !if "$(USE_UTIL)" == "1" utils: @echo cd ..\..\util\build\msw >utils.bat *************** *** 136,139 **** --- 154,158 ---- call utils.bat @del utils.bat + !endif modules: *************** *** 143,146 **** --- 162,166 ---- @del modules.bat + !if "$(USE_APPS)" == "1" apps: @echo cd ..\..\apps\build\msw >apps.bat *************** *** 148,150 **** --- 168,171 ---- call apps.bat @del apps.bat + !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.wat 12 Jun 2005 21:31:38 -0000 1.3 --- makefile.wat 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 11,14 **** --- 11,17 ---- # ------------------------------------------------------------------------- + # The directory where wxWidgets library is installed + WX_DIR = $(%WXWIN) + # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 *************** *** 20,23 **** --- 23,44 ---- WX_DEBUG = 1 + # Version of the wx library to build against. + WX_VERSION = 26 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_BIN2C = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + + # Does the wxLua socket support need to be compiled ? [0,1] + USE_WXLUASOCKET = 1 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_UTIL = 1 + + # Does the wxLua applications should be compiled ? [0,1] + USE_APPS = 1 + *************** *** 43,46 **** --- 64,75 ---- ### Conditionally set variables: ### + __utils___depname = + !ifeq USE_UTIL 1 + __utils___depname = utils + !endif + __apps___depname = + !ifeq USE_APPS 1 + __apps___depname = apps + !endif ### Variables: ### *************** *** 49,59 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" & WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" ### Targets: ### ! all : .SYMBOLIC utils modules apps clean : .SYMBOLIC --- 78,89 ---- 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)" ### Targets: ### ! all : .SYMBOLIC $(__utils___depname) modules $(__apps___depname) clean : .SYMBOLIC *************** *** 73,80 **** --- 103,112 ---- cd $(WATCOM_CWD) + !ifeq USE_UTIL 1 utils : .SYMBOLIC cd ..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) + !endif modules : .SYMBOLIC *************** *** 83,89 **** --- 115,123 ---- cd $(WATCOM_CWD) + !ifeq USE_APPS 1 apps : .SYMBOLIC cd ..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) + !endif Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.gcc 12 Jun 2005 21:31:38 -0000 1.3 --- makefile.gcc 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 11,14 **** --- 11,17 ---- # ------------------------------------------------------------------------- + # The directory where wxWidgets library is installed + WX_DIR = $(WXWIN) + # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 *************** *** 20,23 **** --- 23,44 ---- WX_DEBUG = 1 + # Version of the wx library to build against. + WX_VERSION = 26 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_BIN2C = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + + # Does the wxLua socket support need to be compiled ? [0,1] + USE_WXLUASOCKET = 1 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_UTIL = 1 + + # Does the wxLua applications should be compiled ? [0,1] + USE_APPS = 1 + *************** *** 31,44 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" ### Conditionally set variables: ### ### Targets: ### ! all: utils modules apps clean: --- 52,72 ---- 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: ### + ifeq ($(USE_UTIL),1) + __utils___depname = utils + endif + ifeq ($(USE_APPS),1) + __apps___depname = apps + endif ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: *************** *** 48,59 **** --- 76,91 ---- $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean + ifeq ($(USE_UTIL),1) utils: $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) + endif modules: $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) + ifeq ($(USE_APPS),1) apps: $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) + endif .PHONY: all clean utils modules apps |
