X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c19d0121f6e3216f21990135ba7238f7e2fe2a53..e0fbcda633e7307c0de5e12e1060303c744cb8ea:/src/stc/makefile.b32

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 492b4e26df..72a60182ab 100644
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -17,52 +17,66 @@ SCINTILLA=.\scintilla
 
 S=$(SCINTILLA)\src
 
-STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
+STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
 
 LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
 
 OBJECTS = \
-    AutoComplete.obj        \
-    CallTip.obj             \
-    CellBuffer.obj          \
-    ContractionState.obj    \
-    Document.obj            \
-    DocumentAccessor.obj    \
-    Editor.obj              \
-    Indicator.obj           \
-    KeyMap.obj              \
-    KeyWords.obj            \
-    LexCPP.obj              \
-    LexHTML.obj             \
-    LexLua.obj              \
-    LexOthers.obj           \
-    LexPerl.obj             \
-    LexPython.obj           \
-    LexSQL.obj              \
-    LexVB.obj               \
-    LineMarker.obj          \
-    PosRegExp.obj           \
-    PropSet.obj             \
-    ScintillaBase.obj       \
-    Style.obj               \
-    UniConversion.obj       \
-    ViewStyle.obj           \
-    WindowAccessor.obj      \
-                            \
-    PlatWX.obj              \
-    ScintillaWX.obj         \
-    stc.obj                 \
+        AutoComplete.obj	\
+        CallTip.obj	        \
+        CellBuffer.obj	    	\
+        ContractionState.obj  	\
+        Document.obj	        \
+	DocumentAccessor.obj	\
+        Editor.obj		\
+        Indicator.obj	        \
+        KeyMap.obj		\
+        KeyWords.obj	        \
+	LexAVE.obj		\
+	LexAda.obj		\
+	LexBaan.obj		\
+	LexBullant.obj		\
+	LexMatlab.obj		\
+	LexCPP.obj		\
+	LexConf.obj		\
+	LexCrontab.obj		\
+	LexEiffel.obj		\
+	LexHTML.obj		\
+	LexLisp.obj		\
+	LexLua.obj		\
+	LexOthers.obj		\
+	LexPascal.obj		\
+	LexPerl.obj		\
+	LexPython.obj		\
+	LexRuby.obj		\
+	LexSQL.obj		\
+	LexVB.obj		\
+        LineMarker.obj	    	\
+        PropSet.obj	        \
+	RESearch.obj		\
+        ScintillaBase.obj	\
+        Style.obj		\
+	StyleContext.obj	\
+	UniConversion.obj	\
+        ViewStyle.obj		\
+	WindowAccessor.obj	\
+                            	\
+	PlatWX.obj              \
+	ScintillaWX.obj         \
+	stc.obj                 \
 
+STCCFG = stc.cfg
+STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
 
-!include $(WXDIR)\src\makelib.b32
+default: $(STCCFG) $(LIBTARGET)
 
-CFG = stc.cfg
-CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
 
 {$(S)}.cxx.obj:
-	bcc32 $(CPPFLAGS) -P -c {$< }
+	bcc32 $(STCCPPFLAGS) -P -c {$< }
+
 
-$(CFG): makefile.b32
+
+$(STCCFG): makefile.b32
 	copy &&!
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
@@ -88,5 +102,14 @@ $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)
 $(STCEXTRACPPFLAGS)
-! $(CFG)
+! $(STCCFG)
+
+
+!include $(WXDIR)\src\makelib.b32
+
+{$(S)}.cpp.obj:
+	bcc32 $(STCCPPFLAGS) -P -c {$< }
+
+.$(SRCSUFF).obj:
+	bcc32 $(STCCPPFLAGS) -c {$< }