X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ace007846cb47a8851354318be733b7f4918e30..0dfb2393ddd200cb698351dbd44590898590d8c1:/utils/makefile.gcc?ds=sidebyside

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 7556b5287b..7d78d3c6ae 100644
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -12,13 +12,15 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
-MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
-	CC=$(CC) USE_GUI=$(USE_GUI) MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) \
-	GCC_VERSION=$(GCC_VERSION) USE_HTML=$(USE_HTML) BUILD=$(BUILD) \
-	DEBUG_INFO=$(DEBUG_INFO) VENDOR=$(VENDOR) UNICODE=$(UNICODE) \
-	OFFICIAL_BUILD=$(OFFICIAL_BUILD) MSLU=$(MSLU) WXUNIV=$(WXUNIV) \
-	RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) CFLAGS=$(CFLAGS) \
-	SHARED=$(SHARED) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL)
+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+	LDFLAGS="$(LDFLAGS)" CC="$(CC)" USE_GUI="$(USE_GUI)" \
+	MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
+	GCC_VERSION="$(GCC_VERSION)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \
+	DEBUG_INFO="$(DEBUG_INFO)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
+	VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+	MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+	CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \
+	USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
 
 ### Conditionally set variables: ###
 
@@ -26,15 +28,24 @@ MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
 
 ### Targets: ###
 
-all: tex2rtf helpgen
+all: configtool emulator helpview tex2rtf helpgen
 
 clean: 
 	-if exist .\*.o del .\*.o
 
+configtool: 
+	$(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) all
+
+emulator: 
+	$(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
+
 helpgen: 
 	$(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
 
+helpview: 
+	$(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
+
 tex2rtf: 
 	$(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean helpgen tex2rtf
+.PHONY: all clean configtool emulator helpgen helpview tex2rtf