From: Francesco M. <fr...@us...> - 2007-04-23 22:44:36
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32574/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefile build system to use wxWidgets standard presets Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** makefile.vc 13 Feb 2007 18:43:11 -0000 1.43 --- makefile.vc 23 Apr 2007 22:44:29 -0000 1.44 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 42,49 **** SHARED = 0 ! # The directory where wxWidgets library is installed ! WX_DIR = $(WXWIN) ! ! # Use DLL build of wx library to use? [0,1] # 1 - DLL WX_SHARED = 0 --- 42,47 ---- SHARED = 0 ! # Use DLL build of wx library? [0,1] ! # 0 - Static # 1 - DLL WX_SHARED = 0 *************** *** 57,60 **** --- 55,61 ---- WX_MONOLITHIC = 0 + # The directory where wxWidgets library is installed + WX_DIR = $(WXWIN) + # Should the wxLua applications be compiled ? [0,1] USE_APPS = 1 *************** *** 109,115 **** MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ ! UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ --- 110,116 ---- MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ ! UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_SHARED="$(WX_SHARED)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! WX_DIR="$(WX_DIR)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ *************** *** 122,189 **** ### Conditionally set variables: ### ! !if "$(SHARED)" == "0" ! SHARED_SUFFIX = !endif ! !if "$(SHARED)" == "1" ! SHARED_SUFFIX = dll !endif !if "$(SHARED)" == "0" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\vc$(WXLIBPOSTFIX)_lib !endif !if "$(SHARED)" == "1" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\vc$(WXLIBPOSTFIX)_dll !endif !if "$(USE_APPS)" == "1" __apps___depname = sub_apps !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" - WXLIBPOSTFIX = d - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" - WXLIBPOSTFIX = ud - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif ! all: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### ! all: ..\..\lib\vc_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\vc_lib sub_modules $(__apps___depname) clean: ! -if exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch ! cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean ! cd $(MAKEDIR) ! cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean ! cd $(MAKEDIR) ! ! ..\..\lib\vc_dll: ! if not exist ..\..\lib\vc_dll mkdir ..\..\lib\vc_dll ! ! ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES): ! if not exist ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) mkdir ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ! ..\..\lib\vc_lib: ! if not exist ..\..\lib\vc_lib mkdir ..\..\lib\vc_lib sub_modules: ! cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) ! cd $(MAKEDIR) !if "$(USE_APPS)" == "1" sub_apps: ! cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) ! cd $(MAKEDIR) !endif --- 123,193 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" ! WXLIBPOSTFIX = d ! !endif ! !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_SHARED)" == "0" ! WXLIBPATH = \lib\vc_lib ! !endif ! !if "$(WX_SHARED)" == "1" ! WXLIBPATH = \lib\vc_dll !endif !if "$(SHARED)" == "0" ! _BUILDDIR_SHARED_SUFFIX = !endif !if "$(SHARED)" == "1" ! _BUILDDIR_SHARED_SUFFIX = _dll !endif !if "$(USE_APPS)" == "1" __apps___depname = sub_apps !endif ! all: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX): ! -if not exist vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) mkdir vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) ### Targets: ### ! all: test_for_selected_wxbuild sub_modules $(__apps___depname) clean: ! -if exist vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.obj del vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.obj ! -if exist vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res del vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res ! -if exist vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch del vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch ! cd modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean ! cd "$(MAKEDIR)" ! cd apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean ! cd "$(MAKEDIR)" ! test_for_selected_wxbuild: ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo ---------------------------------------------------------------------------- ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo The selected wxWidgets build is not available! ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo Please use the options prefixed with WX_ to select another wxWidgets build. ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo ---------------------------------------------------------------------------- ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! exit 1 sub_modules: ! cd modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) ! cd "$(MAKEDIR)" !if "$(USE_APPS)" == "1" sub_apps: ! cd apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) ! cd "$(MAKEDIR)" !endif *************** *** 192,196 **** @echo Creating wxLua documentation using doxygen... @echo ============================================= ! cd ../..\docs doxygen doxygen.cfg --- 196,200 ---- @echo Creating wxLua documentation using doxygen... @echo ============================================= ! cd ..\..\docs doxygen doxygen.cfg Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** makefile.bcc 13 Feb 2007 18:43:11 -0000 1.39 --- makefile.bcc 23 Apr 2007 22:44:29 -0000 1.40 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 65,74 **** !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 --- 65,69 ---- !endif ! # Use DLL build of wx library? [0,1] !ifndef WX_SHARED WX_SHARED = 0 *************** *** 85,88 **** --- 80,88 ---- !endif + # The directory where wxWidgets library is installed + !ifndef WX_DIR + WX_DIR = $(WXWIN) + !endif + # Should the wxLua applications be compiled ? [0,1] !ifndef USE_APPS *************** *** 171,176 **** -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ -DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \ ! -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ ! -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ -DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \ --- 171,176 ---- -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ -DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \ ! -DWX_SHARED="$(WX_SHARED)" -DWX_VERSION="$(WX_VERSION)" \ ! -DWX_MONOLITHIC="$(WX_MONOLITHIC)" -DWX_DIR="$(WX_DIR)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ -DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \ *************** *** 184,255 **** ### Conditionally set variables: ### ! !if "$(SHARED)" == "0" ! SHARED_SUFFIX = !endif ! !if "$(SHARED)" == "1" ! SHARED_SUFFIX = dll !endif !if "$(SHARED)" == "0" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\bcc$(WXLIBPOSTFIX)_lib !endif !if "$(SHARED)" == "1" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\bcc$(WXLIBPOSTFIX)_dll !endif !if "$(USE_APPS)" == "1" __apps___depname = apps !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" - WXLIBPOSTFIX = d - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" - WXLIBPOSTFIX = ud - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif ! all: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### ! all: ..\..\lib\bcc_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\bcc_lib modules $(__apps___depname) clean: ! -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm ! @echo cd ..\..\modules\build\msw >bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! call bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! call bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! ! ..\..\lib\bcc_dll: ! if not exist ..\..\lib\bcc_dll mkdir ..\..\lib\bcc_dll ! ! ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES): ! if not exist ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) mkdir ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ! ..\..\lib\bcc_lib: ! if not exist ..\..\lib\bcc_lib mkdir ..\..\lib\bcc_lib modules: ! @echo cd ..\..\modules\build\msw >bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! call bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! call bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat !endif --- 184,258 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" ! WXLIBPOSTFIX = d ! !endif ! !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_SHARED)" == "0" ! WXLIBPATH = \lib\bcc_lib ! !endif ! !if "$(WX_SHARED)" == "1" ! WXLIBPATH = \lib\bcc_dll !endif !if "$(SHARED)" == "0" ! _BUILDDIR_SHARED_SUFFIX = !endif !if "$(SHARED)" == "1" ! _BUILDDIR_SHARED_SUFFIX = _dll !endif !if "$(USE_APPS)" == "1" __apps___depname = apps !endif ! all: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX): ! -if not exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) mkdir bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) ### Targets: ### ! all: test_for_selected_wxbuild modules $(__apps___depname) clean: ! -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.obj del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.obj ! -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res ! -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm ! @echo cd modules\build\msw >bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\modules.bat ! call bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\modules.bat ! @del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\modules.bat ! @echo cd apps\build\msw >bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\apps.bat ! call bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\apps.bat ! @del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\apps.bat ! test_for_selected_wxbuild: ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo ---------------------------------------------------------------------------- ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo The selected wxWidgets build is not available! ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo Please use the options prefixed with WX_ to select another wxWidgets build. ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo ---------------------------------------------------------------------------- ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! exit 1 modules: ! @echo cd modules\build\msw >bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\modules.bat ! call bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\modules.bat ! @del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd apps\build\msw >bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\apps.bat ! call bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\apps.bat ! @del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\apps.bat !endif *************** *** 258,262 **** @echo Creating wxLua documentation using doxygen... @echo ============================================= ! cd ../..\docs doxygen doxygen.cfg --- 261,265 ---- @echo Creating wxLua documentation using doxygen... @echo ============================================= ! cd ..\..\docs doxygen doxygen.cfg Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** makefile.wat 13 Feb 2007 18:43:11 -0000 1.42 --- makefile.wat 23 Apr 2007 22:44:29 -0000 1.43 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 42,49 **** SHARED = 0 ! # The directory where wxWidgets library is installed ! WX_DIR = $(%WXWIN) ! ! # Use DLL build of wx library to use? [0,1] # 1 - DLL WX_SHARED = 0 --- 42,47 ---- SHARED = 0 ! # Use DLL build of wx library? [0,1] ! # 0 - Static # 1 - DLL WX_SHARED = 0 *************** *** 57,60 **** --- 55,61 ---- WX_MONOLITHIC = 0 + # The directory where wxWidgets library is installed + WX_DIR = $(%WXWIN) + # Should the wxLua applications be compiled ? [0,1] USE_APPS = 1 *************** *** 122,152 **** ### Conditionally set variables: ### - SHARED_SUFFIX = - !ifeq SHARED 0 - SHARED_SUFFIX = - !endif - !ifeq SHARED 1 - SHARED_SUFFIX = dll - !endif - __WXLUA_BINOUTPUT_FOLDER_FILENAMES = - !ifeq SHARED 0 - __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\wat$(WXLIBPOSTFIX)_lib - !endif - !ifeq SHARED 1 - __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\wat$(WXLIBPOSTFIX)_dll - !endif - __apps___depname = - !ifeq USE_APPS 1 - __apps___depname = apps - !endif WXLIBPOSTFIX = !ifeq BUILD debug ! !ifeq UNICODE 0 ! WXLIBPOSTFIX = d !endif !endif !ifeq BUILD debug ! !ifeq UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif --- 123,135 ---- ### Conditionally set variables: ### WXLIBPOSTFIX = !ifeq BUILD debug ! !ifeq UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif !ifeq BUILD debug ! !ifeq UNICODE 0 ! WXLIBPOSTFIX = d !endif !endif *************** *** 156,159 **** --- 139,160 ---- !endif !endif + WXLIBPATH = + !ifeq WX_SHARED 0 + WXLIBPATH = \lib\wat_lib + !endif + !ifeq WX_SHARED 1 + WXLIBPATH = \lib\wat_dll + !endif + _BUILDDIR_SHARED_SUFFIX = + !ifeq SHARED 0 + _BUILDDIR_SHARED_SUFFIX = + !endif + !ifeq SHARED 1 + _BUILDDIR_SHARED_SUFFIX = _dll + !endif + __apps___depname = + !ifeq USE_APPS 1 + __apps___depname = apps + !endif ### Variables: ### *************** *** 161,167 **** MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & ! UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" & ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" & --- 162,168 ---- MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & ! UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_SHARED="$(WX_SHARED)" & ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & ! WX_DIR="$(WX_DIR)" USE_APPS="$(USE_APPS)" & USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" & *************** *** 173,208 **** ! all : watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) : ! -if not exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### ! all : .SYMBOLIC ..\..\lib\wat_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\wat_lib modules $(__apps___depname) clean : .SYMBOLIC ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk ! -if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch ! 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) ! ..\..\lib\wat_dll : ! if not exist ..\..\lib\wat_dll mkdir ..\..\lib\wat_dll ! ! ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) : ! if not exist ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) mkdir ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ! ! ..\..\lib\wat_lib : ! if not exist ..\..\lib\wat_lib mkdir ..\..\lib\wat_lib modules : .SYMBOLIC ! cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) --- 174,212 ---- ! all : watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) : ! -if not exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) mkdir watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild modules $(__apps___depname) clean : .SYMBOLIC ! -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.obj del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.obj ! -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res ! -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.lbc del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.lbc ! -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.ilk del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.ilk ! -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch ! 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) ! test_for_selected_wxbuild : ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo ---------------------------------------------------------------------------- ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo The selected wxWidgets build is not available! ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo Please use the options prefixed with WX_ to select another wxWidgets build. ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo ---------------------------------------------------------------------------- ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! exit 1 modules : .SYMBOLIC ! cd modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) *************** *** 210,214 **** !ifeq USE_APPS 1 apps : .SYMBOLIC ! cd ..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) --- 214,218 ---- !ifeq USE_APPS 1 apps : .SYMBOLIC ! cd apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) *************** *** 219,223 **** @echo Creating wxLua documentation using doxygen... @echo ============================================= ! cd ../..\docs doxygen doxygen.cfg --- 223,227 ---- @echo Creating wxLua documentation using doxygen... @echo ============================================= ! cd ..\..\docs doxygen doxygen.cfg Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** makefile.gcc 13 Feb 2007 18:43:11 -0000 1.41 --- makefile.gcc 23 Apr 2007 22:44:29 -0000 1.42 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 38,45 **** SHARED := 0 ! # The directory where wxWidgets library is installed ! WX_DIR := $(WXWIN) ! ! # Use DLL build of wx library to use? [0,1] WX_SHARED := 0 --- 38,42 ---- SHARED := 0 ! # Use DLL build of wx library? [0,1] WX_SHARED := 0 *************** *** 50,53 **** --- 47,53 ---- WX_MONOLITHIC := 0 + # The directory where wxWidgets library is installed + WX_DIR := $(WXWIN) + # Should the wxLua applications be compiled ? [0,1] USE_APPS := 1 *************** *** 102,108 **** MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ ! UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ --- 102,108 ---- MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ ! UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_SHARED="$(WX_SHARED)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! WX_DIR="$(WX_DIR)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ *************** *** 115,132 **** ### Conditionally set variables: ### ! ifeq ($(SHARED),0) ! SHARED_SUFFIX = ! endif ! ifeq ($(SHARED),1) ! SHARED_SUFFIX = dll ! endif ! ifeq ($(SHARED),0) ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\gcc$(WXLIBPOSTFIX)_lib ! endif ! ifeq ($(SHARED),1) ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\gcc$(WXLIBPOSTFIX)_dll endif - ifeq ($(USE_APPS),1) - __apps___depname = apps endif ifeq ($(BUILD),debug) --- 115,122 ---- ### Conditionally set variables: ### ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),1) ! WXLIBPOSTFIX = ud endif endif ifeq ($(BUILD),debug) *************** *** 135,143 **** endif endif - ifeq ($(BUILD),debug) - ifeq ($(UNICODE),1) - WXLIBPOSTFIX = ud - endif - endif ifeq ($(BUILD),release) ifeq ($(UNICODE),1) --- 125,128 ---- *************** *** 145,179 **** endif endif ! all: gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### ! all: ..\..\lib\gcc_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\gcc_lib modules $(__apps___depname) clean: ! -if exist gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o del gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o ! -if exist gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d del gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d ! $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean ! ! ..\..\lib\gcc_dll: ! if not exist ..\..\lib\gcc_dll mkdir ..\..\lib\gcc_dll ! ! ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES): ! if not exist ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) mkdir ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ! ..\..\lib\gcc_lib: ! if not exist ..\..\lib\gcc_lib mkdir ..\..\lib\gcc_lib 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 --- 130,182 ---- endif endif + ifeq ($(WX_SHARED),0) + WXLIBPATH = \lib\gcc_lib + endif + ifeq ($(WX_SHARED),1) + WXLIBPATH = \lib\gcc_dll + endif + ifeq ($(SHARED),0) + _BUILDDIR_SHARED_SUFFIX = + endif + ifeq ($(SHARED),1) + _BUILDDIR_SHARED_SUFFIX = _dll + endif + ifeq ($(USE_APPS),1) + __apps___depname = apps + endif ! all: gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX): ! -if not exist gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) mkdir gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) ### Targets: ### ! all: test_for_selected_wxbuild modules $(__apps___depname) clean: ! -if exist gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.o del gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.o ! -if exist gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.d del gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.d ! $(MAKE) -C modules\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C apps\build\msw -f makefile.gcc $(MAKEARGS) clean ! test_for_selected_wxbuild: ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo ---------------------------------------------------------------------------- ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo The selected wxWidgets build is not available! ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo Please use the options prefixed with WX_ to select another wxWidgets build. ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! echo ---------------------------------------------------------------------------- ! @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ ! exit 1 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 *************** *** 182,186 **** @echo Creating wxLua documentation using doxygen... @echo ============================================= ! cd ../..\docs doxygen doxygen.cfg --- 185,189 ---- @echo Creating wxLua documentation using doxygen... @echo ============================================= ! cd ..\..\docs doxygen doxygen.cfg *************** *** 197,199 **** # Dependencies tracking: ! -include gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)/*.d --- 200,202 ---- # Dependencies tracking: ! -include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)/*.d |