[Wxlua-commit] wxLua/util/build/msw makefile.bcc,1.1,1.2 makefile.gcc,1.1,1.2 makefile.vc,1.1,1.2 makefile.wat,1.1,1.2

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

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
Fixed modules compilation

Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.vc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile.vc	12 Jun 2005 21:21:11 -0000	1.1
--- makefile.vc	14 Jun 2005 21:44:42 -0000	1.2
***************
*** 32,37 ****
  WX_DEBUG = 1
  
! # Does the wxLua utilities shoulb be compiled ? [0,1]
! USE_UTIL = 1
  
  
--- 32,37 ----
  WX_DEBUG = 1
  
! # Does the wxLua utilities should be compiled ? [0,1]
! USE_BIN2C = 1
  
  
***************
*** 49,53 ****
  ### Conditionally set variables: ###
  
! !if "$(USE_UTIL)" == "1"
  __bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif
--- 49,53 ----
  ### Conditionally set variables: ###
  
! !if "$(USE_BIN2C)" == "1"
  __bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif
***************
*** 66,70 ****
  	-if exist ..\..\..\bin\bin2c.pdb del ..\..\..\bin\bin2c.pdb
  
! !if "$(USE_UTIL)" == "1"
  ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS)
  	link /NOLOGO /OUT:$@ $(LDFLAGS) @<<
--- 66,70 ----
  	-if exist ..\..\..\bin\bin2c.pdb del ..\..\..\bin\bin2c.pdb
  
! !if "$(USE_BIN2C)" == "1"
  ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS)
  	link /NOLOGO /OUT:$@ $(LDFLAGS) @<<

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.bcc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile.bcc	12 Jun 2005 21:21:11 -0000	1.1
--- makefile.bcc	14 Jun 2005 21:44:42 -0000	1.2
***************
*** 55,61 ****
  !endif
  
! # Does the wxLua utilities shoulb be compiled ? [0,1]
! !ifndef USE_UTIL
! USE_UTIL = 1
  !endif
  
--- 55,61 ----
  !endif
  
! # Does the wxLua utilities should be compiled ? [0,1]
! !ifndef USE_BIN2C
! USE_BIN2C = 1
  !endif
  
***************
*** 74,78 ****
  ### Conditionally set variables: ###
  
! !if "$(USE_UTIL)" == "1"
  __bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif
--- 74,78 ----
  ### Conditionally set variables: ###
  
! !if "$(USE_BIN2C)" == "1"
  __bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif
***************
*** 94,98 ****
  	-if exist ..\..\..\bin\bin2c.ils del ..\..\..\bin\bin2c.ils
  
! !if "$(USE_UTIL)" == "1"
  ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS)
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&|
--- 94,98 ----
  	-if exist ..\..\..\bin\bin2c.ils del ..\..\..\bin\bin2c.ils
  
! !if "$(USE_BIN2C)" == "1"
  ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS)
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&|

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.wat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile.wat	12 Jun 2005 21:21:12 -0000	1.1
--- makefile.wat	14 Jun 2005 21:44:42 -0000	1.2
***************
*** 32,37 ****
  WX_DEBUG = 1
  
! # Does the wxLua utilities shoulb be compiled ? [0,1]
! USE_UTIL = 1
  
  
--- 32,37 ----
  WX_DEBUG = 1
  
! # Does the wxLua utilities should be compiled ? [0,1]
! USE_BIN2C = 1
  
  
***************
*** 59,63 ****
  
  __bin2c___depname =
! !ifeq USE_UTIL 1
  __bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif
--- 59,63 ----
  
  __bin2c___depname =
! !ifeq USE_BIN2C 1
  __bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif
***************
*** 82,86 ****
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe
  
! !ifeq USE_UTIL 1
  ..\..\..\bin\bin2c.exe :  $(BIN2C_OBJECTS)
  	@%create bin2c.lbc
--- 82,86 ----
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe
  
! !ifeq USE_BIN2C 1
  ..\..\..\bin\bin2c.exe :  $(BIN2C_OBJECTS)
  	@%create bin2c.lbc

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.gcc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile.gcc	12 Jun 2005 21:21:11 -0000	1.1
--- makefile.gcc	14 Jun 2005 21:44:42 -0000	1.2
***************
*** 32,37 ****
  WX_DEBUG = 1
  
! # Does the wxLua utilities shoulb be compiled ? [0,1]
! USE_UTIL = 1
  
  
--- 32,37 ----
  WX_DEBUG = 1
  
! # Does the wxLua utilities should be compiled ? [0,1]
! USE_BIN2C = 1
  
  
***************
*** 49,53 ****
  ### Conditionally set variables: ###
  
! ifeq ($(USE_UTIL),1)
  __bin2c___depname = ..\..\..\bin\bin2c.exe
  endif
--- 49,53 ----
  ### Conditionally set variables: ###
  
! ifeq ($(USE_BIN2C),1)
  __bin2c___depname = ..\..\..\bin\bin2c.exe
  endif
***************
*** 62,66 ****
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe
  
! ifeq ($(USE_UTIL),1)
  ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS)
  	$(CC) -o $@ $(BIN2C_OBJECTS) $(LDFLAGS)
--- 62,66 ----
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe
  
! ifeq ($(USE_BIN2C),1)
  ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS)
  	$(CC) -o $@ $(BIN2C_OBJECTS) $(LDFLAGS)