added format parameter to File/DirName()

[wxWidgets.git] / contrib / src / stc / makefile.g95

diff --git a/contrib/src/stc/makefile.g95 b/contrib/src/stc/makefile.g95
index 5b0cc020897131717451c49c41ec669127c834a6..25dd4ad0cdb77a12739326d256be1cd933563e8c 100644 (file)
--- a/contrib/src/stc/makefile.g95
+++ b/contrib/src/stc/makefile.g95
@@ -7,40 +7,58 @@ WXDIR = ../../..
 
 SCINTILLA=$(WXDIR)/contrib/src/stc/scintilla
 S=$(SCINTILLA)/src
 
 SCINTILLA=$(WXDIR)/contrib/src/stc/scintilla
 S=$(SCINTILLA)/src

-EXTRAINC=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) -I. -I$(WXDIR)/contrib/include
+EXTRAINC=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S) -I. -I$(WXDIR)/contrib/include

 
 OBJECTS = \
 
 OBJECTS = \

-       $(S)/Accessor.$(OBJSUFF) \
-       $(S)/AutoComplete.$(OBJSUFF) \
-       $(S)/CallTip.$(OBJSUFF) \
-       $(S)/CellBuffer.$(OBJSUFF) \
-       $(S)/ContractionState.$(OBJSUFF)\
-       $(S)/Document.$(OBJSUFF) \
-       $(S)/Editor.$(OBJSUFF) \
-       $(S)/Indicator.$(OBJSUFF) \
-       $(S)/KeyMap.$(OBJSUFF) \
-       $(S)/KeyWords.$(OBJSUFF) \
-       $(S)/LineMarker.$(OBJSUFF) \
-       $(S)/PropSet.$(OBJSUFF) \
-       $(S)/ScintillaBase.$(OBJSUFF) \
-       $(S)/Style.$(OBJSUFF) \
-       $(S)/ViewStyle.$(OBJSUFF) \
-       $(S)/LexCPP.$(OBJSUFF)  \
-       $(S)/LexHTML.$(OBJSUFF) \
-       $(S)/LexLua.$(OBJSUFF) \
-       $(S)/LexOthers.$(OBJSUFF) \
-       $(S)/LexPerl.$(OBJSUFF) \
-       $(S)/LexPython.$(OBJSUFF) \
-       $(S)/LexSQL.$(OBJSUFF)  \
-       $(S)/LexVB.$(OBJSUFF)   \
-       $(S)/DocumentAccessor.$(OBJSUFF)\
+        $(S)/AutoComplete.$(OBJSUFF)   \
+        $(S)/CallTip.$(OBJSUFF)                \
+        $(S)/CellBuffer.$(OBJSUFF)     \
+        $(S)/ContractionState.$(OBJSUFF) \
+        $(S)/Document.$(OBJSUFF)       \
+       $(S)/DocumentAccessor.$(OBJSUFF) \
+        $(S)/Editor.$(OBJSUFF)         \
+        $(S)/Indicator.$(OBJSUFF)      \
+        $(S)/KeyMap.$(OBJSUFF)         \
+        $(S)/KeyWords.$(OBJSUFF)       \
+       $(S)/LexAVE.$(OBJSUFF)          \
+       $(S)/LexAda.$(OBJSUFF)          \
+       $(S)/LexAsm.$(OBJSUFF)          \
+       $(S)/LexBaan.$(OBJSUFF)         \
+       $(S)/LexBullant.$(OBJSUFF)      \
+       $(S)/LexMatlab.$(OBJSUFF)       \
+       $(S)/LexCPP.$(OBJSUFF)          \
+       $(S)/LexConf.$(OBJSUFF)         \
+       $(S)/LexCrontab.$(OBJSUFF)      \
+       $(S)/LexCSS.$(OBJSUFF)          \
+       $(S)/LexEiffel.$(OBJSUFF)       \
+       $(S)/LexFortran.$(OBJSUFF)      \
+       $(S)/LexHTML.$(OBJSUFF)         \
+       $(S)/LexLisp.$(OBJSUFF)         \
+       $(S)/LexLua.$(OBJSUFF)          \
+       $(S)/LexOthers.$(OBJSUFF)       \
+       $(S)/LexPOV.$(OBJSUFF)          \
+       $(S)/LexPascal.$(OBJSUFF)       \
+       $(S)/LexPerl.$(OBJSUFF)         \
+       $(S)/LexPython.$(OBJSUFF)       \
+       $(S)/LexRuby.$(OBJSUFF)         \
+       $(S)/LexSQL.$(OBJSUFF)          \
+       $(S)/LexVB.$(OBJSUFF)           \
+        $(S)/LineMarker.$(OBJSUFF)     \
+        $(S)/PropSet.$(OBJSUFF)                \
+       $(S)/RESearch.$(OBJSUFF)        \
+        $(S)/ScintillaBase.$(OBJSUFF)  \
+        $(S)/Style.$(OBJSUFF)          \
+       $(S)/StyleContext.$(OBJSUFF)    \

        $(S)/UniConversion.$(OBJSUFF)   \
        $(S)/UniConversion.$(OBJSUFF)   \

+        $(S)/ViewStyle.$(OBJSUFF)      \

        $(S)/WindowAccessor.$(OBJSUFF)  \
        $(S)/WindowAccessor.$(OBJSUFF)  \

-       $(S)/PosRegExp.$(OBJSUFF) \
+       $(S)/XPM.$(OBJSUFF)             \
+       \

        PlatWX.$(OBJSUFF) \
        ScintillaWX.$(OBJSUFF) \
        stc.$(OBJSUFF)
 
        PlatWX.$(OBJSUFF) \
        ScintillaWX.$(OBJSUFF) \
        stc.$(OBJSUFF)
 

-LIBTARGET = $(WXDIR)/contrib/lib/libstc.a
+
+LIBTARGET = $(WXDIR)/lib/libstc.a

 
 include $(WXDIR)/src/makelib.g95
\ No newline at end of file
 
 include $(WXDIR)/src/makelib.g95
\ No newline at end of file