compilation fixes for wxAnyStrPtr for VC7; mention it in the change log

[wxWidgets.git] / utils / makefile.bcc

diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index e7441934441c4c8e8d5daf4ebfd0f9c7188b199d..5a56ccdeee7e228824f94854b9d1c11b3bdc1499 100644 (file)
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.5 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -23,13 +23,19 @@ BCCDIR = $(MAKEDIR)\..
 
 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)" \
-       -DVENDOR="$(VENDOR)" -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       -DCPP="$(CPP)" -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_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_PROPGRID="$(USE_PROPGRID)" \
+       -DUSE_RICHTEXT="$(USE_RICHTEXT)" -DUSE_STC="$(USE_STC)" \
+       -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
+       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
+       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
+       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
+       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
        -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
@@ -38,15 +44,12 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Targets: ###
 
-all: configtool emulator helpview tex2rtf helpgen
+all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc
 
 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
+       -if exist .\*.csm del .\*.csm
        @echo cd emulator\src >emulator.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat
        call emulator.bat
@@ -55,20 +58,22 @@ clean:
        @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: 
-       @echo cd configtool\src >configtool.bat
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>configtool.bat
-       call configtool.bat
-       @del configtool.bat
+       @echo cd hhp2cached >hhp2cached.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>hhp2cached.bat
+       call hhp2cached.bat
+       @del hhp2cached.bat
+       @echo cd ifacecheck\src >ifacecheck.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ifacecheck.bat
+       call ifacecheck.bat
+       @del ifacecheck.bat
+       @echo cd screenshotgen\src >screenshotgen.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>screenshotgen.bat
+       call screenshotgen.bat
+       @del screenshotgen.bat
+       @echo cd wxrc >wxrc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wxrc.bat
+       call wxrc.bat
+       @del wxrc.bat
 
 emulator: 
        @echo cd emulator\src >emulator.bat
@@ -82,14 +87,27 @@ helpview:
        call helpview.bat
        @del helpview.bat
 
-tex2rtf: 
-       @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
+hhp2cached: 
+       @echo cd hhp2cached >hhp2cached.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>hhp2cached.bat
+       call hhp2cached.bat
+       @del hhp2cached.bat
+
+ifacecheck: 
+       @echo cd ifacecheck\src >ifacecheck.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ifacecheck.bat
+       call ifacecheck.bat
+       @del ifacecheck.bat
+
+screenshotgen: 
+       @echo cd screenshotgen\src >screenshotgen.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>screenshotgen.bat
+       call screenshotgen.bat
+       @del screenshotgen.bat
+
+wxrc: 
+       @echo cd wxrc >wxrc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wxrc.bat
+       call wxrc.bat
+       @del wxrc.bat
+