added common regex

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

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 3d52701553c92b4b97c475d24ee1320131840385..8e602b4098643d30d5a126f492be5443baf2cd74 100644 (file)
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -2,7 +2,7 @@
 # File:                makefile.b32
 # Author:      Julian Smart
 # Created:     1999
 # File:                makefile.b32
 # Author:      Julian Smart
 # Created:     1999

-# Updated:     
+# Updated:

 # Copyright:
 #
 # Makefile : Builds wxMMedia library for 32-bit BC++
 # Copyright:
 #
 # Makefile : Builds wxMMedia library for 32-bit BC++


@@ -18,31 +18,45 @@ S=$(SCINTILLA)\src
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
 
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
 

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

 
 OBJECTS = \
 
 OBJECTS = \

-       Accessor.obj    \

        AutoComplete.obj        \
        AutoComplete.obj        \

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

        Editor.obj              \
        Editor.obj              \

-       Indicator.obj   \
+       Indicator.obj           \

        KeyMap.obj              \
        KeyMap.obj              \

-       KeyWords.obj    \
-       LineMarker.obj  \
-       PropSet.obj     \
+       KeyWords.obj            \
+       LexCPP.obj              \
+       LexHTML.obj             \
+       LexLua.obj              \
+       LexOthers.obj           \
+       LexPerl.obj             \
+       LexPython.obj           \
+       LexSQL.obj              \
+       LexVB.obj               \
+       LineMarker.obj          \
+       PropSet.obj             \
+       PosRegExp.obj           \

        ScintillaBase.obj       \
        Style.obj               \
        ScintillaBase.obj       \
        Style.obj               \

-       ViewStyle.obj   \
+       UniConversion.obj       \
+       ViewStyle.obj           \
+       WindowAccessor.obj      \

                                \
        PlatWX.obj              \
                                \
        PlatWX.obj              \

-       ScintillaWX.obj \
-       stc.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)