fixed menubar attaching: create it first, THEN set pointer to it

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

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 8e602b4098643d30d5a126f492be5443baf2cd74..40e5497e246fe1f75ca39cf060f6ba833552a670 100644 (file)
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -14,56 +14,66 @@
 WXDIR = $(WXWIN)
 
 SCINTILLA=.\scintilla
+
 S=$(SCINTILLA)\src
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -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              \
        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)
 
 {$(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
@@ -89,5 +99,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 {$< }