Remove all lines containing cvs/svn "$Id$" keyword.

[wxWidgets.git] / samples / font / makefile.bcc

diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc
index 91eeafab0ae1e37e9e3258f5ddbdae569f28ee1f..595969b714cebefe9c3a44aaf7aaf5a7bbad973f 100644 (file)
--- a/samples/font/makefile.bcc
+++ b/samples/font/makefile.bcc
@@ -182,7 +182,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