[Wxlua-commit] wxLua/build/msw makefile.bcc,1.7,1.8 makefile.gcc,1.7,1.8 makefile.vc,1.8,1.9 makefile.wat,1.7,1.8

[John L. <jr...@us...>]

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebake


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** makefile.vc	24 Nov 2005 21:34:16 -0000	1.8
--- makefile.vc	25 Nov 2005 20:04:35 -0000	1.9
***************
*** 60,66 ****
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
  	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \
! 	USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" USE_UTIL="$(USE_UTIL)" \
! 	USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###
--- 60,67 ----
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
  	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \
! 	USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \
! 	WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
! 	USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.bcc	24 Nov 2005 21:34:16 -0000	1.7
--- makefile.bcc	25 Nov 2005 20:04:34 -0000	1.8
***************
*** 90,93 ****
--- 90,103 ----
  !endif
  
+ # The folder where wxluasetup.h is searched 
+ !ifndef WXLUASETUP_DIR
+ WXLUASETUP_DIR = ..\..\modules\wxbind\src
+ !endif
+ 
+ # The folder where wxLuaBind library is sent 
+ !ifndef WXLUABINDLIB_DIR
+ WXLUABINDLIB_DIR = ..\..\lib
+ !endif
+ 
  # Compile the wxLua app ? [0,1]
  !ifndef USE_WXLUAAPP
***************
*** 125,130 ****
  	-DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \
  	-DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \
! 	-DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
! 	-DUSE_UTIL="$(USE_UTIL)" -DUSE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###
--- 135,142 ----
  	-DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \
  	-DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \
! 	-DWXLUASETUP_DIR="$(WXLUASETUP_DIR)" \
! 	-DWXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	-DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" -DUSE_UTIL="$(USE_UTIL)" \
! 	-DUSE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.wat	24 Nov 2005 21:34:16 -0000	1.7
--- makefile.wat	25 Nov 2005 20:04:35 -0000	1.8
***************
*** 86,92 ****
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" &
  	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" &
! 	USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" &
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" USE_UTIL="$(USE_UTIL)" &
! 	USE_APPS="$(USE_APPS)"
  
  
--- 86,93 ----
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" &
  	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" &
! 	USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" &
! 	WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" &
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" &
! 	USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)"
  
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.gcc	24 Nov 2005 21:34:16 -0000	1.7
--- makefile.gcc	25 Nov 2005 20:04:35 -0000	1.8
***************
*** 60,66 ****
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
  	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \
! 	USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" USE_UTIL="$(USE_UTIL)" \
! 	USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###
--- 60,67 ----
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
  	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \
! 	USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \
! 	WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
! 	USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###