Changed all symbols with the name "id" to "timerid" to allow Objective-C++

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

diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc
index 3500de358404dbf45f1e7b122574078e2334e764..63ec5d12ad9ed389da1e72084076ec8a07779963 100644 (file)
--- a/samples/opengl/makefile.bcc
+++ b/samples/opengl/makefile.bcc
@@ -8,7 +8,7 @@
 BCCDIR = $(MAKEDIR)\..
 !endif
 
-!include ../../build/config.bcc
+!include ../../build/msw/config.bcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -20,6 +20,15 @@ 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)"
 
 ### Conditionally set variables: ###
 
@@ -34,10 +43,16 @@ clean:
        -if exist .\*.res del .\*.res
 
 cube: 
-       (cd cube && $(MAKE) all)
+       cd cube
+       $(MAKE) -f makefile.bcc $(MAKEARGS) all
+       cd ..
 
 isosurf: 
-       (cd isosurf && $(MAKE) all)
+       cd isosurf
+       $(MAKE) -f makefile.bcc $(MAKEARGS) all
+       cd ..
 
 penguin: 
-       (cd penguin && $(MAKE) all)
+       cd penguin
+       $(MAKE) -f makefile.bcc $(MAKEARGS) all
+       cd ..