include needed for CFString conversion routines (param default)

[wxWidgets.git] / contrib / src / stc / Makefile.in

diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in
index 3deb9ba6ba53535539a8e3444a2686457b39f7ba..042da17f87d235ddad1f1daef70465841f540b11 100644 (file)
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -9,13 +9,13 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 
 scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla
-libsrc_dir = contrib/src/stc@PATH_IFS@$(scintilla_dir)/src
+libsrc_dir = contrib/src/stc/scintilla/src:$(top_srcdir)/contrib/src/stc
 
-TARGET_LIBNAME=libstc
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_stc-@WX_RELEASE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=stc
@@ -34,9 +34,13 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
         KeyMap.o               \
         KeyWords.o             \
        LexAVE.o                \
+       LexBaan.o               \
+       LexBullant.o            \
+       LexMatlab.o             \
        LexAda.o                \
        LexCPP.o                \
        LexConf.o               \
+       LexCrontab.o            \
        LexEiffel.o             \
        LexHTML.o               \
        LexLisp.o               \
@@ -53,13 +57,14 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
        RESearch.o              \
         ScintillaBase.o                \
         Style.o                        \
+       StyleContext.o          \
        UniConversion.o         \
         ViewStyle.o            \
        WindowAccessor.o        \
 
 DEPFILES=$(OBJECTS:.o=.d)
 
-APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/contrib/include
+APPEXTRADEFS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makelib.env