Remove wxRTTI macro for wxComboBox from Motif port.

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 39c6d4678673c307f9b3bb5ce37e9190285a6de9..67d405e377448e86e2d8e27cc8fbfc70ee445bcd 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -15,11 +15,12 @@ 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)" \
+       TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
        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_WEB="$(USE_WEB)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \\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
@@ -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 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 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
@@ -115,7 +116,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 web -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
@@ -344,8 +345,8 @@ validate:
 vscroll: \r
        $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all\r
 \r
-web: \r
-       $(MAKE) -C web -f makefile.gcc $(MAKEARGS) all\r
+webview: \r
+       $(MAKE) -C webview -f makefile.gcc $(MAKEARGS) all\r
 \r
 widgets: \r
        $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all\r
@@ -368,7 +369,7 @@ memcheck:
        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 web \\r
+       taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview \\r
        widgets wizard wrapsizer xrc memcheck\r
 \r
 \r