X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e93c6860edf545074ef6046e19b58ab5d5843ca5..bc59c2062c644236551b9652874414bdb2144955:/samples/opengl/makefile.bcc?ds=sidebyside

diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc
index 3500de3584..6b48870dee 100644
--- a/samples/opengl/makefile.bcc
+++ b/samples/opengl/makefile.bcc
@@ -4,22 +4,32 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
+.autodepend
+
 !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
 
-!include ../../build/config.bcc
+!include ../../build/msw/config.bcc
 
 # -------------------------------------------------------------------------
 # 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: ###
 
+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 +44,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 ..