X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2b31b87fbac61af6eb96f3f5fa960ee4479bb1d..f155075229d771430f0793700f5048ad4be00e9d:/samples/makefile.bcc?ds=inline

diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index 1fff0974bc..709be8bd1e 100644
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -23,14 +23,16 @@ BCCDIR = $(MAKEDIR)\..
 
 MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
-	-DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \
+	-DCPP="$(CPP)" -DSHARED="$(SHARED)" -DTOOLKIT="$(TOOLKIT)" \
+	-DTOOLKIT_VERSION="$(TOOLKIT_VERSION)" -DWXUNIV="$(WXUNIV)" \
 	-DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
 	-DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
 	-DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
-	-DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
-	-DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \
-	-DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
-	-DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+	-DUSE_HTML="$(USE_HTML)" -DUSE_WEBVIEW="$(USE_WEBVIEW)" \
+	-DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" -DUSE_AUI="$(USE_AUI)" \
+	-DUSE_RIBBON="$(USE_RIBBON)" -DUSE_PROPGRID="$(USE_PROPGRID)" \
+	-DUSE_RICHTEXT="$(USE_RICHTEXT)" -DUSE_STC="$(USE_STC)" \
+	-DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
 	-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
 	-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
 	-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
@@ -44,7 +46,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### 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 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 .\*.obj del .\*.obj
@@ -242,6 +244,10 @@ clean:
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>power.bat
 	call power.bat
 	@del power.bat
+	@echo cd preferences >preferences.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>preferences.bat
+	call preferences.bat
+	@del preferences.bat
 	@echo cd printing >printing.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat
 	call printing.bat
@@ -346,6 +352,10 @@ clean:
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>vscroll.bat
 	call vscroll.bat
 	@del vscroll.bat
+	@echo cd webview >webview.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>webview.bat
+	call webview.bat
+	@del webview.bat
 	@echo cd widgets >widgets.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widgets.bat
 	call widgets.bat
@@ -655,6 +665,12 @@ power:
 	call power.bat
 	@del power.bat
 
+preferences: 
+	@echo cd preferences >preferences.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>preferences.bat
+	call preferences.bat
+	@del preferences.bat
+
 printing: 
 	@echo cd printing >printing.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat
@@ -811,6 +827,12 @@ vscroll:
 	call vscroll.bat
 	@del vscroll.bat
 
+webview: 
+	@echo cd webview >webview.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>webview.bat
+	call webview.bat
+	@del webview.bat
+
 widgets: 
 	@echo cd widgets >widgets.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>widgets.bat