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

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

diff --git a/samples/uiaction/makefile.wat b/samples/uiaction/makefile.wat
index e344b1a88a6e03f868ba179d20ce013b0e16bb02..c2f6e72abd30ae95402b1983447076592098866f 100644 (file)
--- a/samples/uiaction/makefile.wat
+++ b/samples/uiaction/makefile.wat
@@ -31,23 +31,12 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 \r
 ### Conditionally set variables: ###\r
 \r
-WIN32_TOOLKIT_LOWERCASE =\r
-!ifeq TOOLKIT GTK\r
-WIN32_TOOLKIT_LOWERCASE = gtk\r
-!endif\r
-!ifeq TOOLKIT MSW\r
-WIN32_TOOLKIT_LOWERCASE = msw\r
-!endif\r
 PORTNAME =\r
 !ifeq USE_GUI 0\r
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r
-PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)\r
-!endif\r
-WXBASEPORT =\r
-!ifeq TOOLKIT MAC\r
-WXBASEPORT = _carbon\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
 !endif\r
 COMPILER_VERSION =\r
 !ifeq OFFICIAL_BUILD 1\r
@@ -83,14 +72,6 @@ EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 1\r
 EXTRALIBS_FOR_BASE =   \r
 !endif\r
-LIB_GTK =\r
-!ifeq TOOLKIT GTK\r
-!ifeq TOOLKIT_VERSION 2\r
-LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &\r
-       gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &\r
-       glib-2.0.lib\r
-!endif\r
-!endif\r
 __DEBUGINFO_0 =\r
 !ifeq BUILD debug\r
 !ifeq DEBUG_INFO default\r
@@ -168,13 +149,19 @@ __WXLIB_CORE_p = &
 __WXLIB_BASE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_BASE_p = &\r
-       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 __WXLIB_MONO_p =\r
 !ifeq MONOLITHIC 1\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
@@ -246,12 +233,12 @@ LIBDIRNAME = &
 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 UIACTION_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) &\r
-       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &\r
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
-       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples &\r
-       -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &\r
+       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
 UIACTION_OBJECTS =  &\r
        $(OBJS)\uiaction_uiaction.obj\r
 \r
@@ -279,13 +266,13 @@ $(OBJS)\uiaction.exe :  $(UIACTION_OBJECTS) $(OBJS)\uiaction_sample.res
        @%append $(OBJS)\uiaction.lbc option caseexact\r
        @%append $(OBJS)\uiaction.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(UIACTION_OBJECTS)) do @%append $(OBJS)\uiaction.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) $(LIB_GTK)  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)\uiaction.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)\uiaction.lbc library %i\r
        @%append $(OBJS)\uiaction.lbc option resource=$(OBJS)\uiaction_sample.res\r
        @for %i in () do @%append $(OBJS)\uiaction.lbc option stack=%i\r
        wlink @$(OBJS)\uiaction.lbc\r
 \r
 $(OBJS)\uiaction_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
 \r
 $(OBJS)\uiaction_uiaction.obj :  .AUTODEPEND .\uiaction.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(UIACTION_CXXFLAGS) $<\r