fixed bug with redoing the command when there was nothing to redo

[wxWidgets.git] / src / stc / makefile.b32

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 8e602b4098643d30d5a126f492be5443baf2cd74..7a74f314afdf214f63d43e95dd14e40c672ee1f1 100644 (file)
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -14,49 +14,57 @@
 WXDIR = $(WXWIN)
 
 SCINTILLA=.\scintilla
 WXDIR = $(WXWIN)
 
 SCINTILLA=.\scintilla

+

 S=$(SCINTILLA)\src
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
 
 S=$(SCINTILLA)\src
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
 

-LIBTARGET=$(WXDIR)\lib\stc.lib
+LIBTARGET=$(WXDIR)\contrib\lib\stc.lib

 
 OBJECTS = \
 
 OBJECTS = \

-       AutoComplete.obj        \
-       CallTip.obj             \
-       CellBuffer.obj          \
-       ContractionState.obj    \
-       Document.obj            \
+        AutoComplete.obj       \
+        CallTip.obj            \
+        CellBuffer.obj         \
+        ContractionState.obj   \
+        Document.obj           \

        DocumentAccessor.obj    \
        DocumentAccessor.obj    \

-       Editor.obj              \
-       Indicator.obj           \
-       KeyMap.obj              \
-       KeyWords.obj            \
+        Editor.obj             \
+        Indicator.obj          \
+        KeyMap.obj             \
+        KeyWords.obj           \
+       LexAVE.obj              \
+       LexAda.obj              \

        LexCPP.obj              \
        LexCPP.obj              \

+       LexConf.obj             \
+       LexCrontab.obj          \
+       LexEiffel.obj           \

        LexHTML.obj             \
        LexHTML.obj             \

+       LexLisp.obj             \

        LexLua.obj              \
        LexOthers.obj           \
        LexLua.obj              \
        LexOthers.obj           \

+       LexPascal.obj           \

        LexPerl.obj             \
        LexPython.obj           \
        LexPerl.obj             \
        LexPython.obj           \

+       LexRuby.obj             \

        LexSQL.obj              \
        LexVB.obj               \
        LexSQL.obj              \
        LexVB.obj               \

-       LineMarker.obj          \
-       PropSet.obj             \
-       PosRegExp.obj           \
-       ScintillaBase.obj       \
-       Style.obj               \
+        LineMarker.obj         \
+        PropSet.obj            \
+       RESearch.obj            \
+        ScintillaBase.obj      \
+        Style.obj              \
+       StyleContext.obj        \

        UniConversion.obj       \
        UniConversion.obj       \

-       ViewStyle.obj           \
+        ViewStyle.obj          \

        WindowAccessor.obj      \
        WindowAccessor.obj      \

-                               \
-       PlatWX.obj              \
-       ScintillaWX.obj         \
-       stc.obj                 \
+                               \
+       PlatWX.obj              \
+       ScintillaWX.obj         \
+       stc.obj                 \

 
 
 !include $(WXDIR)\src\makelib.b32
 
 
 
 !include $(WXDIR)\src\makelib.b32
 

-all: stc.cfg $(LIBTARGET)
-

 CFG = stc.cfg
 CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
 
 CFG = stc.cfg
 CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)