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

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

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
now BUILDDIR is set exactly like the wxWidgets builddir
system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1
changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use 
external lua
Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting 
lua library (when installed).
Fixed the "samples" directory copy when srcdir==.



Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** makefile.vc	17 Dec 2006 10:33:35 -0000	1.38
--- makefile.vc	19 Dec 2006 21:12:00 -0000	1.39
***************
*** 49,52 ****
--- 49,61 ----
  WX_SHARED = 0
  
+ # Compile Unicode build of wxWidgets? [0,1]
+ #   1 - Unicode
+ WX_UNICODE = 0
+ 
+ # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
+ #   0 - Release
+ #   1 - Debug
+ WX_DEBUG = 1
+ 
  # Version of the wx library to build against. 
  WX_VERSION = 28
***************
*** 98,107 ****
  	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_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
! 	WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
--- 107,118 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \
  	UNICODE="$(UNICODE)" SHARED="$(SHARED)" 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_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \
! 	LUA_DIR="$(LUA_DIR)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
***************
*** 123,140 ****
  __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: vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX):
! 	-if not exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
--- 134,151 ----
  __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
  
  
! all: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX):
! 	-if not exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 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
--- 154,160 ----
  
  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

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** makefile.bcc	17 Dec 2006 10:33:35 -0000	1.35
--- makefile.bcc	19 Dec 2006 21:12:00 -0000	1.36
***************
*** 75,78 ****
--- 75,88 ----
  !endif
  
+ # Compile Unicode build of wxWidgets? [0,1]
+ !ifndef WX_UNICODE
+ WX_UNICODE = 0
+ !endif
+ 
+ # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
+ !ifndef WX_DEBUG
+ WX_DEBUG = 1
+ !endif
+ 
  # Version of the wx library to build against. 
  !ifndef WX_VERSION
***************
*** 90,93 ****
--- 100,113 ----
  !endif
  
+ # Should wxLua use the system-wide Lua library ? [0,1]
+ !ifndef USE_SYSTEM_LUA
+ USE_SYSTEM_LUA = 0
+ !endif
+ 
+ # The path to the Lua library 
+ !ifndef LUA_DIR
+ LUA_DIR = modules\lua
+ !endif
+ 
  # Does the wxLua bindings for STC need to be compiled ? [0,1]
  !ifndef USE_WXBINDSTC
***************
*** 147,152 ****
  	-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_WXBINDSTC="$(USE_WXBINDSTC)" \
  	-DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
  	-DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \
--- 167,174 ----
  	-DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \
  	-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_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \
! 	-DLUA_DIR="$(LUA_DIR)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \
  	-DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
  	-DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \
***************
*** 157,160 ****
--- 179,194 ----
  ### Conditionally set variables: ###
  
+ !if "$(BUILD)" == "debug"
+ WX_DEBUG = 1
+ !endif
+ !if "$(BUILD)" == "release"
+ WX_DEBUG = 0
+ !endif
+ !if "$(UNICODE)" == "0"
+ WX_UNICODE = 0
+ !endif
+ !if "$(UNICODE)" == "1"
+ WX_UNICODE = 1
+ !endif
  !if "$(SHARED)" == "0"
  SHARED_SUFFIX = 
***************
*** 172,189 ****
  __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: bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX):
! 	-if not exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
--- 206,223 ----
  __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
  
  
! all: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX):
! 	-if not exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 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: 
--- 226,240 ----
  
  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: 
***************
*** 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
  
--- 248,262 ----
  
  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
  

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** makefile.wat	17 Dec 2006 10:33:35 -0000	1.37
--- makefile.wat	19 Dec 2006 21:12:00 -0000	1.38
***************
*** 49,52 ****
--- 49,61 ----
  WX_SHARED = 0
  
+ # Compile Unicode build of wxWidgets? [0,1]
+ #   1 - Unicode
+ WX_UNICODE = 0
+ 
+ # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
+ #   0 - Release
+ #   1 - Debug
+ WX_DEBUG = 1
+ 
  # Version of the wx library to build against. 
  WX_VERSION = 28
***************
*** 129,145 ****
  !endif
  WXLIBPOSTFIX =
! !ifeq BUILD debug
! !ifeq UNICODE 0
! WXLIBPOSTFIX = d
  !endif
  !endif
! !ifeq BUILD debug
! !ifeq UNICODE 1
! WXLIBPOSTFIX = ud
  !endif
  !endif
! !ifeq BUILD release
! !ifeq UNICODE 1
! WXLIBPOSTFIX = u
  !endif
  !endif
--- 138,154 ----
  !endif
  WXLIBPOSTFIX =
! !ifeq WX_DEBUG 0
! !ifeq WX_UNICODE 1
! WXLIBPOSTFIX = u
  !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
***************
*** 150,165 ****
  	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_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" &
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" &
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" &
! 	WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" &
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
  
! all : wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) :
! 	-if not exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
--- 159,176 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" &
  	UNICODE="$(UNICODE)" SHARED="$(SHARED)" 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_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" &
! 	LUA_DIR="$(LUA_DIR)" USE_WXBINDSTC="$(USE_WXBINDSTC)" &
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" &
! 	USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" &
! 	USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" &
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" &
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
  
! all : watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) :
! 	-if not exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 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
--- 179,187 ----
  
  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

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** makefile.gcc	17 Dec 2006 10:33:35 -0000	1.36
--- makefile.gcc	19 Dec 2006 21:12:00 -0000	1.37
***************
*** 44,47 ****
--- 44,53 ----
  WX_SHARED = 0
  
+ # Compile Unicode build of wxWidgets? [0,1]
+ WX_UNICODE = 0
+ 
+ # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
+ WX_DEBUG = 1
+ 
  # Version of the wx library to build against. 
  WX_VERSION = 28
***************
*** 91,100 ****
  	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_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
! 	WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
--- 97,108 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \
  	UNICODE="$(UNICODE)" SHARED="$(SHARED)" 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_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \
! 	LUA_DIR="$(LUA_DIR)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
***************
*** 116,139 ****
  __apps___depname = apps
  endif
! ifeq ($(BUILD),debug)
! ifeq ($(UNICODE),0)
! WXLIBPOSTFIX = d
  endif
  endif
! ifeq ($(BUILD),debug)
! ifeq ($(UNICODE),1)
! WXLIBPOSTFIX = ud
  endif
  endif
! ifeq ($(BUILD),release)
! ifeq ($(UNICODE),1)
! WXLIBPOSTFIX = u
  endif
  endif
  
  
! all: gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX):
! 	-if not exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
--- 124,147 ----
  __apps___depname = apps
  endif
! ifeq ($(WX_DEBUG),0)
! ifeq ($(WX_UNICODE),1)
! WXLIBPOSTFIX = u
  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
  
  
! all: gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
! gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX):
! 	-if not exist gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 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
--- 150,155 ----
  
  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
***************
*** 183,185 ****
  
  # Dependencies tracking:
! -include gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)/*.d
--- 191,193 ----
  
  # Dependencies tracking:
! -include gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)/*.d