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

[wxWidgets.git] / samples / taborder / makefile.wat

diff --git a/samples/taborder/makefile.wat b/samples/taborder/makefile.wat
index 64012a6f69de796a7f241420f0007c14a89f6b11..e3b9d392095e579c8412b4c5de453436ce6cbadc 100644 (file)
--- a/samples/taborder/makefile.wat
+++ b/samples/taborder/makefile.wat
@@ -156,6 +156,12 @@ __WXLIB_MONO_p =
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r

+__LIB_SCINTILLA_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
+!endif

 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r


@@ -260,7 +266,7 @@ $(OBJS)\taborder.exe :  $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res
        @%append $(OBJS)\taborder.lbc option caseexact\r
        @%append $(OBJS)\taborder.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(TABORDER_OBJECTS)) do @%append $(OBJS)\taborder.lbc file %i\r
        @%append $(OBJS)\taborder.lbc option caseexact\r
        @%append $(OBJS)\taborder.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(TABORDER_OBJECTS)) do @%append $(OBJS)\taborder.lbc file %i\r

-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taborder.lbc library %i\r
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taborder.lbc library %i\r

        @%append $(OBJS)\taborder.lbc option resource=$(OBJS)\taborder_sample.res\r
        @for %i in () do @%append $(OBJS)\taborder.lbc option stack=%i\r
        wlink @$(OBJS)\taborder.lbc\r
        @%append $(OBJS)\taborder.lbc option resource=$(OBJS)\taborder_sample.res\r
        @for %i in () do @%append $(OBJS)\taborder.lbc option stack=%i\r
        wlink @$(OBJS)\taborder.lbc\r