Applied #15226 with modifications: wxRichTextCtrl: Implement setting properties with...

[wxWidgets.git] / samples / sound / makefile.gcc

diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc
index 8ef0735be812c2c2df112cbfd486859b9bb9566c..4f70447075075c33685ca4cb0328a82c20937476 100644 (file)
--- a/samples/sound/makefile.gcc
+++ b/samples/sound/makefile.gcc
@@ -13,7 +13,7 @@ include ../../build/msw/config.gcc
 ### Variables: ###\r
 \r
 CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
 ### Variables: ###\r
 \r
 CPPDEPS = -MT$@ -MF$@.d -MD -MP\r

-WX_RELEASE_NODOT = 29\r
+WX_RELEASE_NODOT = 30\r

 COMPILER_PREFIX = gcc\r
 OBJS = \\r
        $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
 COMPILER_PREFIX = gcc\r
 OBJS = \\r
        $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r


@@ -172,8 +172,10 @@ __WXLIB_MONO_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r

+ifeq ($(USE_STC),1)\r

 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r

+endif\r

 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r