include "wx/toolbar.h" instead of tbar(base|smpl).h

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

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 7a74f314afdf214f63d43e95dd14e40c672ee1f1..cf4abc21dba06e4cfe7eaff1910008ef93f0b315 100644 (file)
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -13,89 +13,83 @@
 
 WXDIR = $(WXWIN)
 
+LIBTARGET=stc
+
+!include $(WXDIR)\src\makeb32.env
+
 SCINTILLA=.\scintilla
 
 S=$(SCINTILLA)\src
 
-STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
+EXTRASTCCPPFLAGS = -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           \
-       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            \
-       RESearch.obj            \
-        ScintillaBase.obj      \
-        Style.obj              \
-       StyleContext.obj        \
-       UniConversion.obj       \
-        ViewStyle.obj          \
-       WindowAccessor.obj      \
-                               \
-       PlatWX.obj              \
-       ScintillaWX.obj         \
-       stc.obj                 \
+    $(OBJ_PATH)\AutoComplete.obj               \
+    $(OBJ_PATH)\CallTip.obj                    \
+    $(OBJ_PATH)\CellBuffer.obj         \
+    $(OBJ_PATH)\ContractionState.obj   \
+    $(OBJ_PATH)\Document.obj           \
+       $(OBJ_PATH)\DocumentAccessor.obj        \
+    $(OBJ_PATH)\Editor.obj                     \
+    $(OBJ_PATH)\Indicator.obj       \
+    $(OBJ_PATH)\KeyMap.obj                     \
+    $(OBJ_PATH)\KeyWords.obj       \
+       $(OBJ_PATH)\LexAVE.obj                  \
+       $(OBJ_PATH)\LexAda.obj                  \
+       $(OBJ_PATH)\LexAsm.obj                  \
+       $(OBJ_PATH)\LexBaan.obj                 \
+       $(OBJ_PATH)\LexBullant.obj              \
+       $(OBJ_PATH)\LexMatlab.obj               \
+       $(OBJ_PATH)\LexCPP.obj                  \
+       $(OBJ_PATH)\LexConf.obj                 \
+       $(OBJ_PATH)\LexCrontab.obj              \
+       $(OBJ_PATH)\LexCSS.obj                  \
+       $(OBJ_PATH)\LexEiffel.obj               \
+       $(OBJ_PATH)\LexFortran.obj              \
+       $(OBJ_PATH)\LexHTML.obj                 \
+       $(OBJ_PATH)\LexLisp.obj                 \
+       $(OBJ_PATH)\LexLua.obj                  \
+       $(OBJ_PATH)\LexOthers.obj               \
+       $(OBJ_PATH)\LexPOV.obj                  \
+       $(OBJ_PATH)\LexPascal.obj               \
+       $(OBJ_PATH)\LexPerl.obj                 \
+       $(OBJ_PATH)\LexPython.obj               \
+       $(OBJ_PATH)\LexRuby.obj                 \
+       $(OBJ_PATH)\LexSQL.obj                  \
+       $(OBJ_PATH)\LexVB.obj                   \
+    $(OBJ_PATH)\LineMarker.obj     \
+    $(OBJ_PATH)\PropSet.obj            \
+       $(OBJ_PATH)\RESearch.obj                \
+    $(OBJ_PATH)\ScintillaBase.obj      \
+    $(OBJ_PATH)\Style.obj                      \
+       $(OBJ_PATH)\StyleContext.obj    \
+       $(OBJ_PATH)\UniConversion.obj   \
+    $(OBJ_PATH)\ViewStyle.obj          \
+       $(OBJ_PATH)\WindowAccessor.obj  \
+       $(OBJ_PATH)\XPM.obj                     \
+                                       \
+       $(OBJ_PATH)\PlatWX.obj          \
+       $(OBJ_PATH)\ScintillaWX.obj     \
+       $(OBJ_PATH)\stc.obj             \
 
 
-!include $(WXDIR)\src\makelib.b32
+STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) $(EXTRASTCCPPFLAGS)
 
-CFG = stc.cfg
-CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
+.path.obj = $(OBJ_PATH)
 
 {$(S)}.cxx.obj:
-       bcc32 $(CPPFLAGS) -P -c {$< }
-
-$(CFG): makefile.b32
-       copy &&!
--H=$(WXDIR)\src\msw\wx32.csm
--3
--d
--a1 # byte alignment
--R-
--X
--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
-
--L$(BCCDIR)\lib
--D__WXWIN__
--D__WXMSW__
--D__WINDOWS__
--DWIN32
-$(OPT)
-$(DEBUG_FLAGS)
-$(WIN95FLAG)
-$(STCEXTRACPPFLAGS)
-! $(CFG)
+       bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -n$(OBJ_PATH) {$< }
+
+.cpp.obj:
+       bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -n$(OBJ_PATH) {$< }
+
+!include $(WXDIR)\src\makelib.b32
+
+$(OBJ_PATH)\PlatWX.obj : PlatWX.cpp
+
+$(OBJ_PATH)\ScintillaWX.obj : ScintillaWX.cpp
+
+$(OBJ_PATH)\stc.obj : stc.cpp