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

[wxWidgets.git] / samples / joytest / makefile.vc

diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc
index 479486ee5fff2486fdd2040e83fac52084cfc714..8ba302b6f7f7f9d2579ba3c2617454963e414133 100644 (file)
--- a/samples/joytest/makefile.vc
+++ b/samples/joytest/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_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

-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"

 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r