recognize ESC[APE] in menu accel strings (patch 733967)

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

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 40e5497e246fe1f75ca39cf060f6ba833552a670..345d6590004c8d32f8a07b62bf2a9946fef0f816 100644 (file)
--- a/src/stc/makefile.b32
+++ b/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,14 +34,21 @@ OBJECTS = \
         KeyWords.obj           \
        LexAVE.obj              \
        LexAda.obj              \
+       LexAsm.obj              \
+       LexBaan.obj             \
+       LexBullant.obj          \
+       LexMatlab.obj           \
        LexCPP.obj              \
        LexConf.obj             \
        LexCrontab.obj          \
+       LexCSS.obj              \
        LexEiffel.obj           \
+       LexFortran.obj          \
        LexHTML.obj             \
        LexLisp.obj             \
        LexLua.obj              \
        LexOthers.obj           \
+       LexPOV.obj              \
        LexPascal.obj           \
        LexPerl.obj             \
        LexPython.obj           \
@@ -57,16 +64,20 @@ OBJECTS = \
        UniConversion.obj       \
         ViewStyle.obj          \
        WindowAccessor.obj      \
+       XPM.obj                 \
                                \
        PlatWX.obj              \
        ScintillaWX.obj         \
        stc.obj                 \
 
+
 STCCFG = stc.cfg
 STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
 
 default: $(STCCFG) $(LIBTARGET)
 
+cleancfg:
+       del $(STCCFG)
 
 {$(S)}.cxx.obj:
        bcc32 $(STCCPPFLAGS) -P -c {$< }
@@ -84,11 +95,11 @@ $(STCCFG): makefile.b32
 -w-par
 -w-aus
 -w-hid # virtual function A hides virtual function B
--WE
 -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__