Applied recent FL patches from Benjamin Williams <biwilliajsb@yahoo.com>.

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

diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32
index 7a74f314afdf214f63d43e95dd14e40c672ee1f1..0ac8176647195cdd0712327ba716ccbcab61d114 100644 (file)
--- a/contrib/src/stc/makefile.b32
+++ b/contrib/src/stc/makefile.b32
@@ -17,7 +17,7 @@ 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
 
@@ -34,6 +34,9 @@ OBJECTS = \
         KeyWords.obj           \
        LexAVE.obj              \
        LexAda.obj              \
+       LexBaan.obj             \
+       LexBullant.obj          \
+       LexMatlab.obj           \
        LexCPP.obj              \
        LexConf.obj             \
        LexCrontab.obj          \
@@ -62,16 +65,20 @@ OBJECTS = \
        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)
+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
@@ -86,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__
@@ -97,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 {$< }