X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f1802b55dc7cdcd972e1cdce5e512b267ca3b05..25d599ae91f2a57fa942625f2ff65fb6b3e2c014:/src/stc/makefile.b32

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 8e602b4098..0ac8176647 100644
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -14,56 +14,71 @@
 WXDIR = $(WXWIN)
 
 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)\lib\stc.lib
+LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
 
 OBJECTS = \
-	AutoComplete.obj	\
-	CallTip.obj		\
-	CellBuffer.obj		\
-	ContractionState.obj	\
-	Document.obj		\
+        AutoComplete.obj	\
+        CallTip.obj	        \
+        CellBuffer.obj	    	\
+        ContractionState.obj  	\
+        Document.obj	        \
 	DocumentAccessor.obj	\
-	Editor.obj		\
-	Indicator.obj		\
-	KeyMap.obj		\
-	KeyWords.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		\
-	PosRegExp.obj		\
-	ScintillaBase.obj	\
-	Style.obj		\
+        LineMarker.obj	    	\
+        PropSet.obj	        \
+	RESearch.obj		\
+        ScintillaBase.obj	\
+        Style.obj		\
+	StyleContext.obj	\
 	UniConversion.obj	\
-	ViewStyle.obj		\
+        ViewStyle.obj		\
 	WindowAccessor.obj	\
-				\
-	PlatWX.obj		\
-	ScintillaWX.obj		\
-	stc.obj			\
-
+                            	\
+	PlatWX.obj              \
+	ScintillaWX.obj         \
+	stc.obj                 \
 
-!include $(WXDIR)\src\makelib.b32
+STCCFG = stc.cfg
+STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
 
-all: stc.cfg $(LIBTARGET)
+default: $(STCCFG) $(LIBTARGET)
 
-CFG = stc.cfg
-CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
+cleancfg: 
+	del $(STCCFG)
 
 {$(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
@@ -78,7 +93,8 @@ $(CFG): makefile.b32
 -tWM
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
--I$(WXDIR)\include\wx\msw\gnuwin32
+-I$(WXDIR)\include\wx\msw\gnuwin32;$(ARCHINCDIR)
+
 
 -L$(BCCDIR)\lib
 -D__WXWIN__
@@ -89,5 +105,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 {$< }