[Wxlua-commit] wxLua/build/msw makefile.bcc, 1.34, 1.35 makefile.gcc, 1.35, 1.36 makefile.vc, 1.37, 1.38 makefile.wat, 1.36, 1.37

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/build/msw
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28196/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebaked after fixing vc_dll problem, BUILDDIR change, new default for WX_VERSION

Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** makefile.vc	12 Dec 2006 14:53:47 -0000	1.37
--- makefile.vc	17 Dec 2006 10:33:35 -0000	1.38
***************
*** 50,54 ****
  
  # Version of the wx library to build against. 
! WX_VERSION = 26
  
  # Use monolithic build of wxWidgets? [0,1]
--- 50,54 ----
  
  # Version of the wx library to build against. 
! WX_VERSION = 28
  
  # Use monolithic build of wxWidgets? [0,1]
***************
*** 109,116 ****
  
  !if "$(SHARED)" == "0"
! SHARED_SUFFIX = static
  !endif
  !if "$(SHARED)" == "1"
! SHARED_SUFFIX = shared
  !endif
  !if "$(SHARED)" == "0"
--- 109,116 ----
  
  !if "$(SHARED)" == "0"
! SHARED_SUFFIX = 
  !endif
  !if "$(SHARED)" == "1"
! SHARED_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "0"
***************
*** 134,140 ****
  
  
! all: msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
! msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX):
! 	-if not exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
  
  ### Targets: ###
--- 134,140 ----
  
  
! all: vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX):
! 	-if not exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 143,149 ****
  
  clean: 
! 	-if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj
! 	-if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res
! 	-if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch
  	cd ..\..\modules\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS) clean
--- 143,149 ----
  
  clean: 
! 	-if exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj
! 	-if exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res
! 	-if exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch
  	cd ..\..\modules\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS) clean

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** makefile.bcc	12 Dec 2006 14:53:47 -0000	1.34
--- makefile.bcc	17 Dec 2006 10:33:35 -0000	1.35
***************
*** 77,81 ****
  # Version of the wx library to build against. 
  !ifndef WX_VERSION
! WX_VERSION = 26
  !endif
  
--- 77,81 ----
  # Version of the wx library to build against. 
  !ifndef WX_VERSION
! WX_VERSION = 28
  !endif
  
***************
*** 158,165 ****
  
  !if "$(SHARED)" == "0"
! SHARED_SUFFIX = static
  !endif
  !if "$(SHARED)" == "1"
! SHARED_SUFFIX = shared
  !endif
  !if "$(SHARED)" == "0"
--- 158,165 ----
  
  !if "$(SHARED)" == "0"
! SHARED_SUFFIX = 
  !endif
  !if "$(SHARED)" == "1"
! SHARED_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "0"
***************
*** 183,189 ****
  
  
! all: borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX):
! 	-if not exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
  
  ### Targets: ###
--- 183,189 ----
  
  
! all: bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX):
! 	-if not exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 192,206 ****
  
  clean: 
! 	-if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj
! 	-if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res
! 	-if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm
! 	@echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	@del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
  
  ..\..\lib\bcc_dll: 
--- 192,206 ----
  
  clean: 
! 	-if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj
! 	-if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res
! 	-if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm
! 	@echo cd ..\..\modules\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat
! 	call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat
! 	@del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat
! 	@echo cd ..\..\apps\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat
! 	call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat
! 	@del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat
  
  ..\..\lib\bcc_dll: 
***************
*** 214,228 ****
  
  modules: 
! 	@echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
  
  !if "$(USE_APPS)" == "1"
  apps: 
! 	@echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	@del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
  !endif
  
--- 214,228 ----
  
  modules: 
! 	@echo cd ..\..\modules\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat
! 	call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat
! 	@del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat
  
  !if "$(USE_APPS)" == "1"
  apps: 
! 	@echo cd ..\..\apps\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat
! 	call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat
! 	@del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat
  !endif
  

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** makefile.wat	12 Dec 2006 14:53:47 -0000	1.36
--- makefile.wat	17 Dec 2006 10:33:35 -0000	1.37
***************
*** 50,54 ****
  
  # Version of the wx library to build against. 
! WX_VERSION = 26
  
  # Use monolithic build of wxWidgets? [0,1]
--- 50,54 ----
  
  # Version of the wx library to build against. 
! WX_VERSION = 28
  
  # Use monolithic build of wxWidgets? [0,1]
***************
*** 112,119 ****
  SHARED_SUFFIX =
  !ifeq SHARED 0
! SHARED_SUFFIX = static
  !endif
  !ifeq SHARED 1
! SHARED_SUFFIX = shared
  !endif
  __WXLUA_BINOUTPUT_FOLDER_FILENAMES =
--- 112,119 ----
  SHARED_SUFFIX =
  !ifeq SHARED 0
! SHARED_SUFFIX = 
  !endif
  !ifeq SHARED 1
! SHARED_SUFFIX = dll
  !endif
  __WXLUA_BINOUTPUT_FOLDER_FILENAMES =
***************
*** 159,165 ****
  
  
! all : watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
! watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) :
! 	-if not exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
  
  ### Targets: ###
--- 159,165 ----
  
  
! all : wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) :
! 	-if not exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 168,176 ****
  
  clean : .SYMBOLIC 
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.lbc del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.lbc
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.ilk del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.ilk
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch
  	cd ..\..\modules\build\msw
  	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
--- 168,176 ----
  
  clean : .SYMBOLIC 
! 	-if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj
! 	-if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res
! 	-if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc
! 	-if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk
! 	-if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch
  	cd ..\..\modules\build\msw
  	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** makefile.gcc	12 Dec 2006 14:53:47 -0000	1.35
--- makefile.gcc	17 Dec 2006 10:33:35 -0000	1.36
***************
*** 45,49 ****
  
  # Version of the wx library to build against. 
! WX_VERSION = 26
  
  # Use monolithic build of wxWidgets? [0,1]
--- 45,49 ----
  
  # Version of the wx library to build against. 
! WX_VERSION = 28
  
  # Use monolithic build of wxWidgets? [0,1]
***************
*** 102,109 ****
  
  ifeq ($(SHARED),0)
! SHARED_SUFFIX = static
  endif
  ifeq ($(SHARED),1)
! SHARED_SUFFIX = shared
  endif
  ifeq ($(SHARED),0)
--- 102,109 ----
  
  ifeq ($(SHARED),0)
! SHARED_SUFFIX = 
  endif
  ifeq ($(SHARED),1)
! SHARED_SUFFIX = dll
  endif
  ifeq ($(SHARED),0)
***************
*** 133,139 ****
  
  
! all: mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
! mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX):
! 	-if not exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
  
  ### Targets: ###
--- 133,139 ----
  
  
! all: gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX):
! 	-if not exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 142,147 ****
  
  clean: 
! 	-if exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.o del mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.o
! 	-if exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.d del mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.d
  	$(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean
  	$(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean
--- 142,147 ----
  
  clean: 
! 	-if exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o del gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o
! 	-if exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d del gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d
  	$(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean
  	$(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean
***************
*** 183,185 ****
  
  # Dependencies tracking:
! -include mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)/*.d
--- 183,185 ----
  
  # Dependencies tracking:
! -include gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)/*.d