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

[wxWidgets.git] / samples / makefile.wat

diff --git a/samples/makefile.wat b/samples/makefile.wat
index b477d18061e82933931c5472127b424a0b2d1d49..67cc07764594614e900957d3e9cd005d615fb0f9 100644 (file)
--- a/samples/makefile.wat
+++ b/samples/makefile.wat
@@ -36,13 +36,14 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 \r
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &\r
        CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &\r
 \r
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &\r
        CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &\r

-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &\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
+       TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" &\r
+       UNICODE="$(UNICODE)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" &\r
+       DEBUG_FLAG="$(DEBUG_FLAG)" MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" &\r
+       USE_HTML="$(USE_HTML)" USE_WEBVIEW="$(USE_WEBVIEW)" &\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_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &\r
        USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" &\r
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &\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


@@ -53,7 +54,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
 \r
 ### Targets: ###\r
 \r
 \r
 ### Targets: ###\r
 \r

-all : .SYMBOLIC 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 : .SYMBOLIC 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 : .SYMBOLIC \r
        -if exist .\*.obj del .\*.obj\r
 \r
 clean : .SYMBOLIC \r
        -if exist .\*.obj del .\*.obj\r


@@ -205,6 +206,9 @@ clean : .SYMBOLIC
        cd power\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r
        cd power\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r

+       cd preferences\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
+       cd $(WATCOM_CWD)\r

        cd printing\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r
        cd printing\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r


@@ -542,6 +546,11 @@ power : .SYMBOLIC
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
        cd $(WATCOM_CWD)\r
 \r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
        cd $(WATCOM_CWD)\r
 \r

+preferences : .SYMBOLIC \r
+       cd preferences\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
+       cd $(WATCOM_CWD)\r
+\r

 printing : .SYMBOLIC \r
        cd printing\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
 printing : .SYMBOLIC \r
        cd printing\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r