compilation fix after wxGUIAppTraits::GetToolkitVersion() introduction

[wxWidgets.git] / samples / makefile.bcc

diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index 68c3536eaa3caa26862b1abae525548a984feaed..35d91c2e050beeb0d7d4dfef7e052db11404303a 100644 (file)
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -23,12 +23,15 @@ 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_XRC="$(USE_XRC)" \
-       -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" \
-       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       -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)" \
@@ -40,11 +43,12 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Targets: ###
 
-all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+all: access artprov calendar caret checklst config combo console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
+       -if exist .\*.csm del .\*.csm
        @echo cd access >access.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>access.bat
        call access.bat
@@ -69,6 +73,10 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>config.bat
        call config.bat
        @del config.bat
+       @echo cd combo >combo.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>combo.bat
+       call combo.bat
+       @del combo.bat
        @echo cd console >console.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>console.bat
        call console.bat
@@ -201,10 +209,6 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>menu.bat
        call menu.bat
        @del menu.bat
-       @echo cd mfc >mfc.bat
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mfc.bat
-       call mfc.bat
-       @del mfc.bat
        @echo cd minifram >minifram.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>minifram.bat
        call minifram.bat
@@ -245,6 +249,10 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>png.bat
        call png.bat
        @del png.bat
+       @echo cd popup >popup.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>popup.bat
+       call popup.bat
+       @del popup.bat
        @echo cd printing >printing.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat
        call printing.bat
@@ -261,10 +269,6 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>render.bat
        call render.bat
        @del render.bat
-       @echo cd richedit >richedit.bat
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>richedit.bat
-       call richedit.bat
-       @del richedit.bat
        @echo cd rotate >rotate.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>rotate.bat
        call rotate.bat
@@ -305,10 +309,6 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>statbar.bat
        call statbar.bat
        @del statbar.bat
-       @echo cd tab >tab.bat
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>tab.bat
-       call tab.bat
-       @del tab.bat
        @echo cd taskbar >taskbar.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taskbar.bat
        call taskbar.bat
@@ -349,6 +349,10 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wizard.bat
        call wizard.bat
        @del wizard.bat
+       @echo cd mfc >mfc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mfc.bat
+       call mfc.bat
+       @del mfc.bat
 
 access: 
        @echo cd access >access.bat
@@ -386,6 +390,12 @@ config:
        call config.bat
        @del config.bat
 
+combo: 
+       @echo cd combo >combo.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>combo.bat
+       call combo.bat
+       @del combo.bat
+
 console: 
        @echo cd console >console.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>console.bat
@@ -584,12 +594,6 @@ menu:
        call menu.bat
        @del menu.bat
 
-mfc: 
-       @echo cd mfc >mfc.bat
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mfc.bat
-       call mfc.bat
-       @del mfc.bat
-
 minifram: 
        @echo cd minifram >minifram.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>minifram.bat
@@ -650,6 +654,12 @@ png:
        call png.bat
        @del png.bat
 
+popup: 
+       @echo cd popup >popup.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>popup.bat
+       call popup.bat
+       @del popup.bat
+
 printing: 
        @echo cd printing >printing.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat
@@ -674,12 +684,6 @@ render:
        call render.bat
        @del render.bat
 
-richedit: 
-       @echo cd richedit >richedit.bat
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richedit.bat
-       call richedit.bat
-       @del richedit.bat
-
 rotate: 
        @echo cd rotate >rotate.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>rotate.bat
@@ -740,12 +744,6 @@ statbar:
        call statbar.bat
        @del statbar.bat
 
-tab: 
-       @echo cd tab >tab.bat
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>tab.bat
-       call tab.bat
-       @del tab.bat
-
 taskbar: 
        @echo cd taskbar >taskbar.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taskbar.bat
@@ -805,3 +803,10 @@ wizard:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wizard.bat
        call wizard.bat
        @del wizard.bat
+
+mfc: 
+       @echo cd mfc >mfc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mfc.bat
+       call mfc.bat
+       @del mfc.bat
+