compilation fix after wxGUIAppTraits::GetToolkitVersion() introduction

[wxWidgets.git] / samples / html / makefile.bcc

diff --git a/samples/html/makefile.bcc b/samples/html/makefile.bcc
index 9105bea97b050824f02f01129623cdec12b7aeef..b0ba54470c46e45424c018e85202b59d2ba0c27f 100644 (file)
--- a/samples/html/makefile.bcc
+++ b/samples/html/makefile.bcc
@@ -1,10 +1,15 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

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

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

+.autodepend
+

 !ifndef BCCDIR
 !ifndef BCCDIR

+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif

 BCCDIR = $(MAKEDIR)\..
 !endif
 
 BCCDIR = $(MAKEDIR)\..
 !endif
 


@@ -14,20 +19,23 @@ BCCDIR = $(MAKEDIR)\..
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 

-!if "$(BCCDIR)" == "\.."
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-

 ### Variables: ###
 
 ### Variables: ###
 

-MAKEARGS = -DCPPFLAGS=$(CPPFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) \
-       -DLDFLAGS=$(LDFLAGS) -DCC=$(CC) -DUSE_GUI=$(USE_GUI) \
-       -DMONOLITHIC=$(MONOLITHIC) -DCXXFLAGS=$(CXXFLAGS) -DUSE_HTML=$(USE_HTML) \
-       -DBUILD=$(BUILD) -DDEBUG_INFO=$(DEBUG_INFO) -DVENDOR=$(VENDOR) \
-       -DUNICODE=$(UNICODE) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DMSLU=$(MSLU) \
-       -DWXUNIV=$(WXUNIV) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DCXX=$(CXX) -DCFG=$(CFG) \
-       -DCFLAGS=$(CFLAGS) -DSHARED=$(SHARED) -DUSE_ODBC=$(USE_ODBC) \
-       -DUSE_OPENGL=$(USE_OPENGL)
+MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
+       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
+       -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_RICHTEXT="$(USE_RICHTEXT)" \
+       -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
+       -DUSE_THREADS="$(USE_THREADS)" -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: ###
 
 
 ### Conditionally set variables: ###
 


@@ -37,46 +45,88 @@ MAKEARGS = -DCPPFLAGS=$(CPPFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) \
 
 all: about help helpview printing test virtual widget zip
 
 
 all: about help helpview printing test virtual widget zip
 

-about: 
-       cd about
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
-

 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res

+       -if exist .\*.csm del .\*.csm
+       @echo cd about >about.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>about.bat
+       call about.bat
+       @del about.bat
+       @echo cd help >help.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>help.bat
+       call help.bat
+       @del help.bat
+       @echo cd helpview >helpview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat
+       call helpview.bat
+       @del helpview.bat
+       @echo cd printing >printing.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat
+       call printing.bat
+       @del printing.bat
+       @echo cd test >test.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>test.bat
+       call test.bat
+       @del test.bat
+       @echo cd virtual >virtual.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>virtual.bat
+       call virtual.bat
+       @del virtual.bat
+       @echo cd widget >widget.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widget.bat
+       call widget.bat
+       @del widget.bat
+       @echo cd zip >zip.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>zip.bat
+       call zip.bat
+       @del zip.bat
+
+about: 
+       @echo cd about >about.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>about.bat
+       call about.bat
+       @del about.bat

 
 help: 
 
 help: 

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

 
 helpview: 
 
 helpview: 

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

 
 printing: 
 
 printing: 

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

 
 test: 
 
 test: 

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

 
 virtual: 
 
 virtual: 

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

 
 widget: 
 
 widget: 

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

 
 zip: 
 
 zip: 

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