fixed compile error

[wxWidgets.git] / utils / makefile.bcc

diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index ef1c80ca48c6ab17c2ff8274502c739383a9ae0c..e7441934441c4c8e8d5daf4ebfd0f9c7188b199d 100644 (file)
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -21,15 +21,16 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DMONOLITHIC="$(MONOLITHIC)" \
-       -DCXXFLAGS="$(CXXFLAGS)" -DVENDOR="$(VENDOR)" \
-       -DRUNTIME_LIBS="$(RUNTIME_LIBS)" -DLDFLAGS="$(LDFLAGS)" \
-       -DUSE_OPENGL="$(USE_OPENGL)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
-       -DUNICODE="$(UNICODE)" -DCC="$(CC)" -DUSE_GUI="$(USE_GUI)" \
-       -DUSE_HTML="$(USE_HTML)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
+MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
+       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
+       -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" -DUNICODE="$(UNICODE)" \
+       -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
+       -DDEBUG_FLAG="$(DEBUG_FLAG)" -DMONOLITHIC="$(MONOLITHIC)" \
+       -DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" \
+       -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" \

        -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
        -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \

-       -DMSLU="$(MSLU)" -DWXUNIV="$(WXUNIV)" -DCXX="$(CXX)" -DCFG="$(CFG)" \
-       -DCFLAGS="$(CFLAGS)" -DSHARED="$(SHARED)" -DUSE_ODBC="$(USE_ODBC)"
+       -DVENDOR="$(VENDOR)" -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -42,28 +43,53 @@ all: configtool emulator helpview tex2rtf helpgen
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res

+       @echo cd configtool\src >configtool.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>configtool.bat
+       call configtool.bat
+       @del configtool.bat
+       @echo cd emulator\src >emulator.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat
+       call emulator.bat
+       @del emulator.bat
+       @echo cd helpview\src >helpview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat
+       call helpview.bat
+       @del helpview.bat
+       @echo cd tex2rtf\src >tex2rtf.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>tex2rtf.bat
+       call tex2rtf.bat
+       @del tex2rtf.bat
+       @echo cd HelpGen >helpgen.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpgen.bat
+       call helpgen.bat
+       @del helpgen.bat

 
 configtool: 
 
 configtool: 

-       cd configtool\src
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..\..
+       @echo cd configtool\src >configtool.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>configtool.bat
+       call configtool.bat
+       @del configtool.bat

 
 emulator: 
 
 emulator: 

-       cd emulator\src
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..\..
-
-helpgen: 
-       cd HelpGen
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd emulator\src >emulator.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>emulator.bat
+       call emulator.bat
+       @del emulator.bat

 
 helpview: 
 
 helpview: 

-       cd helpview\src
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..\..
+       @echo cd helpview\src >helpview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat
+       call helpview.bat
+       @del helpview.bat

 
 tex2rtf: 
 
 tex2rtf: 

-       cd tex2rtf\src
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..\..
+       @echo cd tex2rtf\src >tex2rtf.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>tex2rtf.bat
+       call tex2rtf.bat
+       @del tex2rtf.bat
+
+helpgen: 
+       @echo cd HelpGen >helpgen.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpgen.bat
+       call helpgen.bat
+       @del helpgen.bat