wxArrayStringProperty::m_delimiter default value was missing. Also cleaned up relevan...

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 1010be6b954b8936b7e24c18a8207a89f8cdc759..b052a943e6bf2d90b462758b01f145fd281bfe6e 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -25,9 +25,8 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
        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
-       USE_GDIPLUS="$(USE_GDIPLUS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \\r
-       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \\r
-       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
        RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"\r
 \r
@@ -37,7 +36,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 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 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
 \r
 clean: \r
        -if exist .\*.o del .\*.o\r
@@ -113,6 +112,7 @@ clean:
        $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) clean\r
+       $(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 widgets -f makefile.gcc $(MAKEARGS) clean\r
@@ -334,6 +334,9 @@ treectrl:
 typetest: \r
        $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) all\r
 \r
+uiaction: \r
+       $(MAKE) -C uiaction -f makefile.gcc $(MAKEARGS) all\r
+\r
 validate: \r
        $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) all\r
 \r
@@ -361,8 +364,8 @@ 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 validate vscroll widgets wizard \\r
-       wrapsizer xrc memcheck\r
+       taskbar text thread toolbar treectrl typetest uiaction validate vscroll widgets \\r
+       wizard wrapsizer xrc memcheck\r
 \r
 \r
 SHELL := $(COMSPEC)\r