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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat util.dsp 
	util.dsw 
Log Message:

Index: util.dsw
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/util.dsw,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** util.dsw	20 Jun 2005 09:02:59 -0000	1.1
--- util.dsw	20 Jun 2005 09:48:55 -0000	1.2
***************
*** 3,7 ****

  ###############################################################################
! Project: "bin2c"=util.dsp - Package Owner=<4>

  Package=<5>
--- 3,7 ----

  ###############################################################################
! Project: "util_bin2c"=util.dsp - Package Owner=<4>

  Package=<5>

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.bcc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.bcc	14 Jun 2005 21:44:42 -0000	1.2
--- makefile.bcc	20 Jun 2005 09:48:39 -0000	1.3
***************
*** 68,90 ****
  ### Variables: ###

! BIN2C_CFLAGS =   -I$(BCCDIR)\include  $(CPPFLAGS) $(CFLAGS)
! BIN2C_OBJECTS =  \
! 	bin2c_bin2c.obj

  ### Conditionally set variables: ###

  !if "$(USE_BIN2C)" == "1"
! __bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif

  ### Targets: ###

! all: $(__bin2c___depname)

  clean: 
! 	-if exist .\*.obj del .\*.obj
! 	-if exist .\*.res del .\*.res
! 	-if exist .\*.csm del .\*.csm
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe
  	-if exist ..\..\..\bin\bin2c.tds del ..\..\..\bin\bin2c.tds
--- 68,94 ----
  ### Variables: ###

! UTIL_BIN2C_CFLAGS =   -I$(BCCDIR)\include  $(CPPFLAGS) $(CFLAGS)
! UTIL_BIN2C_OBJECTS =  \
! 	borland\util_bin2c_bin2c.obj

  ### Conditionally set variables: ###

  !if "$(USE_BIN2C)" == "1"
! __util_bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif

+ all: borland
+ borland:
+ 	-if not exist borland mkdir borland
+ 
  ### Targets: ###

! all: $(__util_bin2c___depname)

  clean: 
! 	-if exist borland\*.obj del borland\*.obj
! 	-if exist borland\*.res del borland\*.res
! 	-if exist borland\*.csm del borland\*.csm
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe
  	-if exist ..\..\..\bin\bin2c.tds del ..\..\..\bin\bin2c.tds
***************
*** 95,105 ****

  !if "$(USE_BIN2C)" == "1"
! ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS)
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&|
! 	c0x32.obj $(BIN2C_OBJECTS),$@,, import32.lib cw32.lib,,
  |
  !endif

! bin2c_bin2c.obj: ..\..\bin2c\bin2c.c
! 	$(CC) -q -c -P- -o$@ $(BIN2C_CFLAGS) $**

--- 99,109 ----

  !if "$(USE_BIN2C)" == "1"
! ..\..\..\bin\bin2c.exe: $(UTIL_BIN2C_OBJECTS)
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&|
! 	c0x32.obj $(UTIL_BIN2C_OBJECTS),$@,, import32.lib cw32.lib,,
  |
  !endif

! borland\util_bin2c_bin2c.obj: ..\..\bin2c\bin2c.c
! 	$(CC) -q -c -P- -o$@ $(UTIL_BIN2C_CFLAGS) $**

Index: util.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/util.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** util.dsp	20 Jun 2005 09:02:58 -0000	1.1
--- util.dsp	20 Jun 2005 09:48:55 -0000	1.2
***************
*** 5,9 ****
  # TARGTYPE "Win32 (x86) Console Application" 0x0103

! CFG=bin2c - Win32 Default
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
--- 5,9 ----
  # TARGTYPE "Win32 (x86) Console Application" 0x0103

! CFG=util_bin2c - Win32 Default
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
***************
*** 14,29 ****
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
! !MESSAGE NMAKE /f "util.mak" CFG="bin2c - Win32 Default"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "bin2c - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE "bin2c - Win32 DLL Unicode" (based on "Win32 (x86) Console Application")
! !MESSAGE "bin2c - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE "bin2c - Win32 DLL" (based on "Win32 (x86) Console Application")
! !MESSAGE "bin2c - Win32 Unicode Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE "bin2c - Win32 Unicode" (based on "Win32 (x86) Console Application")
! !MESSAGE "bin2c - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE "bin2c - Win32 Default" (based on "Win32 (x86) Console Application")
  !MESSAGE 

--- 14,29 ----
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
! !MESSAGE NMAKE /f "util.mak" CFG="util_bin2c - Win32 Default"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "util_bin2c - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE "util_bin2c - Win32 DLL Unicode" (based on "Win32 (x86) Console Application")
! !MESSAGE "util_bin2c - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE "util_bin2c - Win32 DLL" (based on "Win32 (x86) Console Application")
! !MESSAGE "util_bin2c - Win32 Unicode Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE "util_bin2c - Win32 Unicode" (based on "Win32 (x86) Console Application")
! !MESSAGE "util_bin2c - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE "util_bin2c - Win32 Default" (based on "Win32 (x86) Console Application")
  !MESSAGE 

***************
*** 35,49 ****
  RSC=rc.exe

! !IF  "$(CFG)" == "bin2c - Win32 DLL Unicode Debug"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "Release\bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "Release\bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
--- 35,49 ----
  RSC=rc.exe

! !IF  "$(CFG)" == "util_bin2c - Win32 DLL Unicode Debug"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
***************
*** 58,72 ****
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "bin2c - Win32 DLL Unicode"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "Release\bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "Release\bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
--- 58,72 ----
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "util_bin2c - Win32 DLL Unicode"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
***************
*** 81,95 ****
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "bin2c - Win32 DLL Debug"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "Release\bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "Release\bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
--- 81,95 ----
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "util_bin2c - Win32 DLL Debug"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
***************
*** 104,118 ****
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "bin2c - Win32 DLL"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "Release\bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "Release\bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
--- 104,118 ----
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "util_bin2c - Win32 DLL"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
***************
*** 127,141 ****
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "bin2c - Win32 Unicode Debug"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "Release\bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "Release\bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
--- 127,141 ----
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "util_bin2c - Win32 Unicode Debug"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
***************
*** 150,164 ****
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "bin2c - Win32 Unicode"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "Release\bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "Release\bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
--- 150,164 ----
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "util_bin2c - Win32 Unicode"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
***************
*** 173,187 ****
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "bin2c - Win32 Debug"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "Release\bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "Release\bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
--- 173,187 ----
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "util_bin2c - Win32 Debug"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
***************
*** 196,210 ****
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "bin2c - Win32 Default"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "Release\bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "Release\bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
--- 196,210 ----
  # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console

! !ELSEIF  "$(CFG)" == "util_bin2c - Win32 Default"

  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "..\..\..\bin"
! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "..\..\..\bin"
! # PROP Intermediate_Dir "msvc6prj\util_bin2c"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c
***************
*** 223,234 ****
  # Begin Target

! # Name "bin2c - Win32 DLL Unicode Debug"
! # Name "bin2c - Win32 DLL Unicode"
! # Name "bin2c - Win32 DLL Debug"
! # Name "bin2c - Win32 DLL"
! # Name "bin2c - Win32 Unicode Debug"
! # Name "bin2c - Win32 Unicode"
! # Name "bin2c - Win32 Debug"
! # Name "bin2c - Win32 Default"
  # Begin Group "Source Files"

--- 223,234 ----
  # Begin Target

! # Name "util_bin2c - Win32 DLL Unicode Debug"
! # Name "util_bin2c - Win32 DLL Unicode"
! # Name "util_bin2c - Win32 DLL Debug"
! # Name "util_bin2c - Win32 DLL"
! # Name "util_bin2c - Win32 Unicode Debug"
! # Name "util_bin2c - Win32 Unicode"
! # Name "util_bin2c - Win32 Debug"
! # Name "util_bin2c - Win32 Default"
  # Begin Group "Source Files"

Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.vc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.vc	14 Jun 2005 21:44:42 -0000	1.2
--- makefile.vc	20 Jun 2005 09:48:55 -0000	1.3
***************
*** 43,65 ****
  ### Variables: ###

! BIN2C_CFLAGS =  /MD /DWIN32  $(CPPFLAGS) $(CFLAGS)
! BIN2C_OBJECTS =  \
! 	bin2c_bin2c.obj

  ### Conditionally set variables: ###

  !if "$(USE_BIN2C)" == "1"
! __bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif

  ### Targets: ###

! all: $(__bin2c___depname)

  clean: 
! 	-if exist .\*.obj del .\*.obj
! 	-if exist .\*.res del .\*.res
! 	-if exist .\*.pch del .\*.pch
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe
  	-if exist ..\..\..\bin\bin2c.ilk del ..\..\..\bin\bin2c.ilk
--- 43,69 ----
  ### Variables: ###

! UTIL_BIN2C_CFLAGS =  /MD /DWIN32  $(CPPFLAGS) $(CFLAGS)
! UTIL_BIN2C_OBJECTS =  \
! 	msvc\util_bin2c_bin2c.obj

  ### Conditionally set variables: ###

  !if "$(USE_BIN2C)" == "1"
! __util_bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif

+ all: msvc
+ msvc:
+ 	-if not exist msvc mkdir msvc
+ 
  ### Targets: ###

! all: $(__util_bin2c___depname)

  clean: 
! 	-if exist msvc\*.obj del msvc\*.obj
! 	-if exist msvc\*.res del msvc\*.res
! 	-if exist msvc\*.pch del msvc\*.pch
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe
  	-if exist ..\..\..\bin\bin2c.ilk del ..\..\..\bin\bin2c.ilk
***************
*** 67,77 ****

  !if "$(USE_BIN2C)" == "1"
! ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS)
  	link /NOLOGO /OUT:$@ $(LDFLAGS) @<<
! 	$(BIN2C_OBJECTS)
  <<
  !endif

! bin2c_bin2c.obj: ..\..\bin2c\bin2c.c
! 	$(CC) /c /nologo /TC /Fo$@ $(BIN2C_CFLAGS) $**

--- 71,81 ----

  !if "$(USE_BIN2C)" == "1"
! ..\..\..\bin\bin2c.exe: $(UTIL_BIN2C_OBJECTS)
  	link /NOLOGO /OUT:$@ $(LDFLAGS) @<<
! 	$(UTIL_BIN2C_OBJECTS)
  <<
  !endif

! msvc\util_bin2c_bin2c.obj: ..\..\bin2c\bin2c.c
! 	$(CC) /c /nologo /TC /Fo$@ $(UTIL_BIN2C_CFLAGS) $**

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.wat,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.wat	14 Jun 2005 21:44:42 -0000	1.2
--- makefile.wat	20 Jun 2005 09:48:55 -0000	1.3
***************
*** 58,99 ****
  ### Conditionally set variables: ###

! __bin2c___depname =
  !ifeq USE_BIN2C 1
! __bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif

  ### Variables: ###

! BIN2C_CFLAGS =   $(CPPFLAGS) $(CFLAGS)
! BIN2C_OBJECTS =  &
! 	bin2c_bin2c.obj

  ### Targets: ###

! all : .SYMBOLIC $(__bin2c___depname)

  clean : .SYMBOLIC 
! 	-if exist .\*.obj del .\*.obj
! 	-if exist .\*.res del .\*.res
! 	-if exist .\*.lbc del .\*.lbc
! 	-if exist .\*.ilk del .\*.ilk
! 	-if exist .\*.pch del .\*.pch
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe

  !ifeq USE_BIN2C 1
! ..\..\..\bin\bin2c.exe :  $(BIN2C_OBJECTS)
! 	@%create bin2c.lbc
! 	@%append bin2c.lbc option quiet
! 	@%append bin2c.lbc name $^@
! 	@%append bin2c.lbc option caseexact
! 	@%append bin2c.lbc $(LDFLAGS)
! 	@for %i in ($(BIN2C_OBJECTS)) do @%append bin2c.lbc file %i
! 	@for %i in () do @%append bin2c.lbc library %i
! 	@%append bin2c.lbc
! 	wlink @bin2c.lbc
  !endif

! bin2c_bin2c.obj :  .AUTODEPEND ..\..\bin2c\bin2c.c
! 	$(CC) -zq -fo=$^@ $(BIN2C_CFLAGS) $<

--- 58,103 ----
  ### Conditionally set variables: ###

! __util_bin2c___depname =
  !ifeq USE_BIN2C 1
! __util_bin2c___depname = ..\..\..\bin\bin2c.exe
  !endif

  ### Variables: ###

! UTIL_BIN2C_CFLAGS =   $(CPPFLAGS) $(CFLAGS)
! UTIL_BIN2C_OBJECTS =  &
! 	watcom\util_bin2c_bin2c.obj

+ all : watcom
+ watcom :
+ 	-if not exist watcom mkdir watcom
+ 
  ### Targets: ###

! all : .SYMBOLIC $(__util_bin2c___depname)

  clean : .SYMBOLIC 
! 	-if exist watcom\*.obj del watcom\*.obj
! 	-if exist watcom\*.res del watcom\*.res
! 	-if exist watcom\*.lbc del watcom\*.lbc
! 	-if exist watcom\*.ilk del watcom\*.ilk
! 	-if exist watcom\*.pch del watcom\*.pch
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe

  !ifeq USE_BIN2C 1
! ..\..\..\bin\bin2c.exe :  $(UTIL_BIN2C_OBJECTS)
! 	@%create watcom\util_bin2c.lbc
! 	@%append watcom\util_bin2c.lbc option quiet
! 	@%append watcom\util_bin2c.lbc name $^@
! 	@%append watcom\util_bin2c.lbc option caseexact
! 	@%append watcom\util_bin2c.lbc $(LDFLAGS)
! 	@for %i in ($(UTIL_BIN2C_OBJECTS)) do @%append watcom\util_bin2c.lbc file %i
! 	@for %i in () do @%append watcom\util_bin2c.lbc library %i
! 	@%append watcom\util_bin2c.lbc
! 	wlink @watcom\util_bin2c.lbc
  !endif

! watcom\util_bin2c_bin2c.obj :  .AUTODEPEND ..\..\bin2c\bin2c.c
! 	$(CC) -zq -fo=$^@ $(UTIL_BIN2C_CFLAGS) $<

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.gcc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.gcc	14 Jun 2005 21:44:42 -0000	1.2
--- makefile.gcc	20 Jun 2005 09:48:55 -0000	1.3
***************
*** 43,72 ****
  ### Variables: ###

! BIN2C_CFLAGS =   $(CPPFLAGS) $(CFLAGS)
! BIN2C_OBJECTS =  \
! 	bin2c_bin2c.o

  ### Conditionally set variables: ###

  ifeq ($(USE_BIN2C),1)
! __bin2c___depname = ..\..\..\bin\bin2c.exe
  endif

  ### Targets: ###

! all: $(__bin2c___depname)

  clean: 
! 	-if exist .\*.o del .\*.o
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe

  ifeq ($(USE_BIN2C),1)
! ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS)
! 	$(CC) -o $@ $(BIN2C_OBJECTS) $(LDFLAGS)
  endif

! bin2c_bin2c.o: ../../bin2c/bin2c.c
! 	$(CC) -c -o $@ $(BIN2C_CFLAGS) $<

  .PHONY: all clean
--- 43,76 ----
  ### Variables: ###

! UTIL_BIN2C_CFLAGS =   $(CPPFLAGS) $(CFLAGS)
! UTIL_BIN2C_OBJECTS =  \
! 	mingw\util_bin2c_bin2c.o

  ### Conditionally set variables: ###

  ifeq ($(USE_BIN2C),1)
! __util_bin2c___depname = ..\..\..\bin\bin2c.exe
  endif

+ all: mingw
+ mingw:
+ 	-if not exist mingw mkdir mingw
+ 
  ### Targets: ###

! all: $(__util_bin2c___depname)

  clean: 
! 	-if exist mingw\*.o del mingw\*.o
  	-if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe

  ifeq ($(USE_BIN2C),1)
! ..\..\..\bin\bin2c.exe: $(UTIL_BIN2C_OBJECTS)
! 	$(CC) -o $@ $(UTIL_BIN2C_OBJECTS) $(LDFLAGS)
  endif

! mingw\util_bin2c_bin2c.o: ../../bin2c/bin2c.c
! 	$(CC) -c -o $@ $(UTIL_BIN2C_CFLAGS) $<

  .PHONY: all clean

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

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