Menu
▾
▴
[Wxlua-commit] wxLua/build/msw makefile.bcc, 1.32, 1.33 makefile.gcc, 1.33, 1.34 makefile.vc, 1.35, 1.36 makefile.wat, 1.34, 1.35
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:53
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** makefile.vc 8 Dec 2006 13:19:58 -0000 1.35 --- makefile.vc 11 Dec 2006 00:08:19 -0000 1.36 *************** *** 118,130 **** ### Conditionally set variables: ### - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = ud - !endif - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" - WXLIBPOSTFIX = d - !endif - !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif !if "$(SHARED)" == "0" SHARED_SUFFIX = static --- 118,121 ---- *************** *** 133,139 **** --- 124,145 ---- SHARED_SUFFIX = shared !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 "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" + WXLIBPOSTFIX = d + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = ud + !endif *************** *** 144,148 **** ### Targets: ### ! all: ..\..\lib\vc_lib ..\..\lib\vc_dll ..\..\bin sub_modules $(__apps___depname) clean: --- 150,154 ---- ### Targets: ### ! all: ..\..\lib\vc_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\vc_lib sub_modules $(__apps___depname) clean: *************** *** 157,168 **** cd $(MAKEDIR) - ..\..\lib\vc_lib: - if not exist ..\..\lib\vc_lib mkdir ..\..\lib\vc_lib - ..\..\lib\vc_dll: if not exist ..\..\lib\vc_dll mkdir ..\..\lib\vc_dll ! ..\..\bin: ! if not exist ..\..\bin mkdir ..\..\bin sub_modules: --- 163,174 ---- 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: Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** makefile.bcc 8 Dec 2006 13:19:58 -0000 1.32 --- makefile.bcc 11 Dec 2006 00:08:19 -0000 1.33 *************** *** 168,180 **** ### Conditionally set variables: ### - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = ud - !endif - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" - WXLIBPOSTFIX = d - !endif - !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif !if "$(BUILD)" == "debug" WX_DEBUG = 1 --- 168,171 ---- *************** *** 195,201 **** --- 186,207 ---- SHARED_SUFFIX = shared !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 "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" + WXLIBPOSTFIX = d + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = ud + !endif *************** *** 206,210 **** ### Targets: ### ! all: ..\..\lib\bcc_lib ..\..\lib\bcc_dll ..\..\bin modules $(__apps___depname) clean: --- 212,216 ---- ### Targets: ### ! all: ..\..\lib\bcc_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\bcc_lib modules $(__apps___depname) clean: *************** *** 221,232 **** @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat - ..\..\lib\bcc_lib: - if not exist ..\..\lib\bcc_lib mkdir ..\..\lib\bcc_lib - ..\..\lib\bcc_dll: if not exist ..\..\lib\bcc_dll mkdir ..\..\lib\bcc_dll ! ..\..\bin: ! if not exist ..\..\bin mkdir ..\..\bin modules: --- 227,238 ---- @del borland$(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: Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** makefile.wat 8 Dec 2006 13:19:58 -0000 1.34 --- makefile.wat 11 Dec 2006 00:08:19 -0000 1.35 *************** *** 119,133 **** ### Conditionally set variables: ### ! WXLIBPOSTFIX = ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 ! WXLIBPOSTFIX = d !endif !endif !ifeq WX_DEBUG 0 !ifeq WX_UNICODE 1 --- 119,141 ---- ### Conditionally set variables: ### ! SHARED_SUFFIX = ! !ifeq SHARED 0 ! SHARED_SUFFIX = static !endif + !ifeq SHARED 1 + SHARED_SUFFIX = shared !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 WX_DEBUG 0 !ifeq WX_UNICODE 1 *************** *** 135,148 **** !endif !endif ! SHARED_SUFFIX = ! !ifeq SHARED 0 ! SHARED_SUFFIX = static !endif - !ifeq SHARED 1 - SHARED_SUFFIX = shared !endif ! __apps___depname = ! !ifeq USE_APPS 1 ! __apps___depname = apps !endif --- 143,155 ---- !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 ! WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = ud ! !endif !endif *************** *** 168,172 **** ### Targets: ### ! all : .SYMBOLIC ..\..\lib\wat_lib ..\..\lib\wat_dll ..\..\bin modules $(__apps___depname) clean : .SYMBOLIC --- 175,179 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\lib\wat_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\wat_lib modules $(__apps___depname) clean : .SYMBOLIC *************** *** 183,194 **** cd $(WATCOM_CWD) - ..\..\lib\wat_lib : - if not exist ..\..\lib\wat_lib mkdir ..\..\lib\wat_lib - ..\..\lib\wat_dll : if not exist ..\..\lib\wat_dll mkdir ..\..\lib\wat_dll ! ..\..\bin : ! if not exist ..\..\bin mkdir ..\..\bin modules : .SYMBOLIC --- 190,201 ---- 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 Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** makefile.gcc 8 Dec 2006 13:19:58 -0000 1.33 --- makefile.gcc 11 Dec 2006 00:08:19 -0000 1.34 *************** *** 108,120 **** ### Conditionally set variables: ### ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) ! WXLIBPOSTFIX = d endif endif ifeq ($(WX_DEBUG),0) --- 108,125 ---- ### Conditionally set variables: ### ! ifeq ($(SHARED),0) ! SHARED_SUFFIX = static endif + ifeq ($(SHARED),1) + SHARED_SUFFIX = shared 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 ($(WX_DEBUG),0) *************** *** 123,134 **** endif endif ! ifeq ($(SHARED),0) ! SHARED_SUFFIX = static endif - ifeq ($(SHARED),1) - SHARED_SUFFIX = shared endif ! ifeq ($(USE_APPS),1) ! __apps___depname = apps endif --- 128,140 ---- endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) ! WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud ! endif endif *************** *** 140,144 **** ### Targets: ### ! all: ..\..\lib\gcc_lib ..\..\lib\gcc_dll ..\..\bin modules $(__apps___depname) clean: --- 146,150 ---- ### Targets: ### ! all: ..\..\lib\gcc_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\gcc_lib modules $(__apps___depname) clean: *************** *** 148,159 **** $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean - ..\..\lib\gcc_lib: - if not exist ..\..\lib\gcc_lib mkdir ..\..\lib\gcc_lib - ..\..\lib\gcc_dll: if not exist ..\..\lib\gcc_dll mkdir ..\..\lib\gcc_dll ! ..\..\bin: ! if not exist ..\..\bin mkdir ..\..\bin modules: --- 154,165 ---- $(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: |
