Don't use GetThreadId() in wxMSW code.

[wxWidgets.git] / samples / makefile.bcc

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