Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index adf4396b1f9ffac64ae112c5e2c9a0dbbfc13a9c..f8fcb881bcb2b08cdfa87b2cc9c64cb98ab44aa6 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -15,7 +15,8 @@ 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)" \\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
@@ -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 webview 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
@@ -266,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
@@ -366,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 webview \\r
-       widgets 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