non-pch build fix, indentation and whitespace cleanup

[wxWidgets.git] / demos / makefile.bcc

diff --git a/demos/makefile.bcc b/demos/makefile.bcc
index 84df654a81afd447d6f35c1cbd64aa6317a5dab8..1069662f3a22d5b5ab3424ea32e1e362096b3df5 100644 (file)
--- a/demos/makefile.bcc
+++ b/demos/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -21,15 +21,21 @@ BCCDIR = $(MAKEDIR)\..
 
 ### 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)" \
-       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -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)" -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: ###
 
@@ -39,36 +45,68 @@ MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
 
 all: bombs dbbrowse forty fractal life poem
 
-bombs: 
-       cd bombs
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
-
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
+       -if exist .\*.csm del .\*.csm
+       @echo cd bombs >bombs.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bombs.bat
+       call bombs.bat
+       @del bombs.bat
+       @echo cd dbbrowse >dbbrowse.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dbbrowse.bat
+       call dbbrowse.bat
+       @del dbbrowse.bat
+       @echo cd forty >forty.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>forty.bat
+       call forty.bat
+       @del forty.bat
+       @echo cd fractal >fractal.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>fractal.bat
+       call fractal.bat
+       @del fractal.bat
+       @echo cd life >life.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>life.bat
+       call life.bat
+       @del life.bat
+       @echo cd poem >poem.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>poem.bat
+       call poem.bat
+       @del poem.bat
+
+bombs: 
+       @echo cd bombs >bombs.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>bombs.bat
+       call bombs.bat
+       @del bombs.bat
 
 dbbrowse: 
-       cd dbbrowse
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd dbbrowse >dbbrowse.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dbbrowse.bat
+       call dbbrowse.bat
+       @del dbbrowse.bat
 
 forty: 
-       cd forty
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd forty >forty.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>forty.bat
+       call forty.bat
+       @del forty.bat
 
 fractal: 
-       cd fractal
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd fractal >fractal.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>fractal.bat
+       call fractal.bat
+       @del fractal.bat
 
 life: 
-       cd life
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd life >life.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>life.bat
+       call life.bat
+       @del life.bat
 
 poem: 
-       cd poem
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd poem >poem.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>poem.bat
+       call poem.bat
+       @del poem.bat
+