fixing reentrancy which happened in tests, bringing client coordinates origins in...

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index cbad8220c8cc5115a6555357553e980a40ed534c..f265b961eb7ac0fbef307f9c1ec5c4b8fdf7cdc4 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -15,14 +15,15 @@ include ../build/msw/config.gcc
 MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \\r
        LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \\r
        CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \\r
-       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \\r
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" TOOLKIT="$(TOOLKIT)" \\r
+       TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \\r
        UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \\r
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
+       USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \\r
+       USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \\r
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \\r
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
        USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \\r
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
@@ -36,7 +37,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 \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 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 .\*.o del .\*.o\r
@@ -89,6 +90,7 @@ clean:
        $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C power -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C preferences -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean\r
@@ -115,6 +117,7 @@ clean:
        $(MAKE) -C uiaction -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C webview -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean\r
@@ -265,6 +268,9 @@ popup:
 power: \r
        $(MAKE) -C power -f makefile.gcc $(MAKEARGS) all\r
 \r
+preferences: \r
+       $(MAKE) -C preferences -f makefile.gcc $(MAKEARGS) all\r
+\r
 printing: \r
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all\r
 \r
@@ -343,6 +349,9 @@ validate:
 vscroll: \r
        $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all\r
 \r
+webview: \r
+       $(MAKE) -C webview -f makefile.gcc $(MAKEARGS) all\r
+\r
 widgets: \r
        $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all\r
 \r
@@ -362,10 +371,10 @@ memcheck:
        config console controls dataview dialogs dialup display dll dnd docview dragimag \\r
        drawing erase event except exec font grid help htlbox html image internat ipc joytest \\r
        keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \\r
-       opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \\r
-       sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \\r
-       taskbar text thread toolbar treectrl typetest uiaction validate vscroll widgets \\r
-       wizard wrapsizer xrc memcheck\r
+       opengl ownerdrw popup power preferences printing propgrid regtest render ribbon \\r
+       richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg \\r
+       taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll \\r
+       webview widgets wizard wrapsizer xrc memcheck\r
 \r
 \r
 SHELL := $(COMSPEC)\r