compilation fix for gcc4 (patch 1428840)

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

diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc
index bcea63f7f89828b24d5a22a7210c735df9c34dfb..bbd0102a991d21949067b1f0ee2a2b2357cc8189 100644 (file)
--- a/samples/opengl/makefile.bcc
+++ b/samples/opengl/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -26,10 +26,14 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
        -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)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+       -DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" -DUSE_XRC="$(USE_XRC)" \
+       -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: ###
 
@@ -42,18 +46,35 @@ all: cube isosurf penguin
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
+       -if exist .\*.csm del .\*.csm
+       @echo cd cube >cube.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>cube.bat
+       call cube.bat
+       @del cube.bat
+       @echo cd isosurf >isosurf.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>isosurf.bat
+       call isosurf.bat
+       @del isosurf.bat
+       @echo cd penguin >penguin.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>penguin.bat
+       call penguin.bat
+       @del penguin.bat
 
 cube: 
-       cd cube
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd cube >cube.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>cube.bat
+       call cube.bat
+       @del cube.bat
 
 isosurf: 
-       cd isosurf
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd isosurf >isosurf.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>isosurf.bat
+       call isosurf.bat
+       @del isosurf.bat
 
 penguin: 
-       cd penguin
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd penguin >penguin.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>penguin.bat
+       call penguin.bat
+       @del penguin.bat
+