X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e7ad877e6975361e9175f39b9f4d6a0a3860a..f357c0d42c17bf5be30e65e68cd99c474678da71:/src/stc/Makefile.in?ds=inline

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
index 037cb5d626..042da17f87 100644
--- a/src/stc/Makefile.in
+++ b/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
@@ -23,36 +23,48 @@ HEADER_SUBDIR=stc
 HEADERS=stc.h
 
 OBJECTS=PlatWX.o ScintillaWX.o stc.o \
-	DocumentAccessor.o	\
-	LexCPP.o		\
-	LexHTML.o		\
-	LexLua.o		\
-	LexOthers.o		\
-	LexPerl.o		\
-	LexPython.o		\
-	LexSQL.o		\
-	LexVB.o			\
-	UniConversion.o		\
-	WindowAccessor.o	\
         AutoComplete.o	    	\
         CallTip.o	        \
         CellBuffer.o	    	\
         ContractionState.o  	\
         Document.o	        \
+	DocumentAccessor.o	\
         Editor.o		\
         Indicator.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		\
+	LexLua.o		\
+	LexOthers.o		\
+	LexPascal.o		\
+	LexPerl.o		\
+	LexPython.o		\
+	LexRuby.o		\
+	LexSQL.o		\
+	LexVB.o			\
         LineMarker.o	    	\
         PropSet.o	        \
+	RESearch.o		\
         ScintillaBase.o	    	\
         Style.o		        \
+	StyleContext.o		\
+	UniConversion.o		\
         ViewStyle.o		\
-	PosRegExp.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