X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19c35fa587f97cf83e2cb28afe76b8db85b36c9f..d890ea0d4ce6fadf640cbff97ef27c75330c3083:/utils/makefile.bcc

diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 570607e8e5..a72992e38d 100644
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -4,7 +4,12 @@
 #     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
 
@@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\..
 # 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)" \
-	-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)"
+	-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: ###
 
@@ -36,17 +37,32 @@ MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
 
 ### Targets: ###
 
-all: tex2rtf helpgen
+all: configtool emulator helpview tex2rtf helpgen
 
 clean: 
 	-if exist .\*.obj del .\*.obj
 	-if exist .\*.res del .\*.res
 
+configtool: 
+	cd configtool\src
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..\..
+
+emulator: 
+	cd emulator\src
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..\..
+
 helpgen: 
 	cd HelpGen
 	$(MAKE) -f makefile.bcc $(MAKEARGS) all
 	cd ..
 
+helpview: 
+	cd helpview\src
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..\..
+
 tex2rtf: 
 	cd tex2rtf\src
 	$(MAKE) -f makefile.bcc $(MAKEARGS) all