X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3beb50e570f1b4f7a97c767677451ffc558fa22f..HEAD:/samples/makefile.gcc?ds=inline

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 39c6d46786..f8fcb881bc 100644
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -15,11 +15,12 @@ include ../build/msw/config.gcc
 MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 	LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-	LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \
+	LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+	TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
 	UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
 	DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
 	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
-	USE_WEB="$(USE_WEB)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \
+	USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \
 	USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \
 	USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
 	USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
@@ -36,7 +37,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 
 ### Targets: ###
 
-all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll web widgets wizard wrapsizer xrc
+all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc
 
 clean: 
 	-if exist .\*.o del .\*.o
@@ -89,6 +90,7 @@ clean:
 	$(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C power -f makefile.gcc $(MAKEARGS) clean
+	$(MAKE) -C preferences -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
@@ -115,7 +117,7 @@ clean:
 	$(MAKE) -C uiaction -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C validate -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean
-	$(MAKE) -C web -f makefile.gcc $(MAKEARGS) clean
+	$(MAKE) -C webview -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean
@@ -266,6 +268,9 @@ popup:
 power: 
 	$(MAKE) -C power -f makefile.gcc $(MAKEARGS) all
 
+preferences: 
+	$(MAKE) -C preferences -f makefile.gcc $(MAKEARGS) all
+
 printing: 
 	$(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
 
@@ -344,8 +349,8 @@ validate:
 vscroll: 
 	$(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all
 
-web: 
-	$(MAKE) -C web -f makefile.gcc $(MAKEARGS) all
+webview: 
+	$(MAKE) -C webview -f makefile.gcc $(MAKEARGS) all
 
 widgets: 
 	$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all
@@ -366,10 +371,10 @@ memcheck:
 	config console controls dataview dialogs dialup display dll dnd docview dragimag \
 	drawing erase event except exec font grid help htlbox html image internat ipc joytest \
 	keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \
-	opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \
-	sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \
-	taskbar text thread toolbar treectrl typetest uiaction validate vscroll web \
-	widgets wizard wrapsizer xrc memcheck
+	opengl ownerdrw popup power preferences printing propgrid regtest render ribbon \
+	richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg \
+	taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll \
+	webview widgets wizard wrapsizer xrc memcheck
 
 
 SHELL := $(COMSPEC)