Use the wxStaticBox::GetBordersForSizer method to get border information

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

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 492b4e26dfeadca9546bc022a6645ae7737b4fc8..5a9843f863077cb96a351b3658af499d9e606638 100644 (file)
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -17,52 +17,68 @@ SCINTILLA=.\scintilla
 
 S=$(SCINTILLA)\src
 
 
 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
 
 OBJECTS = \
 
 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            \
-    LexCPP.obj              \
-    LexHTML.obj             \
-    LexLua.obj              \
-    LexOthers.obj           \
-    LexPerl.obj             \
-    LexPython.obj           \
-    LexSQL.obj              \
-    LexVB.obj               \
-    LineMarker.obj          \
-    PosRegExp.obj           \
-    PropSet.obj             \
-    ScintillaBase.obj       \
-    Style.obj               \
-    UniConversion.obj       \
-    ViewStyle.obj           \
-    WindowAccessor.obj      \
-                            \
-    PlatWX.obj              \
-    ScintillaWX.obj         \
-    stc.obj                 \
+        AutoComplete.obj       \
+        CallTip.obj            \
+        CellBuffer.obj         \
+        ContractionState.obj   \
+        Document.obj           \
+       DocumentAccessor.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            \
+       RESearch.obj            \
+        ScintillaBase.obj      \
+        Style.obj              \
+       StyleContext.obj        \
+       UniConversion.obj       \
+        ViewStyle.obj          \
+       WindowAccessor.obj      \
+                               \
+       PlatWX.obj              \
+       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:
 
 {$(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
        copy &&!
 -H=$(WXDIR)\src\msw\wx32.csm
 -3


@@ -73,11 +89,11 @@ $(CFG): makefile.b32
 -w-par
 -w-aus
 -w-hid # virtual function A hides virtual function B
 -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
 -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__
 
 -L$(BCCDIR)\lib
 -D__WXWIN__


@@ -88,5 +104,14 @@ $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)
 $(STCEXTRACPPFLAGS)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)
 $(STCEXTRACPPFLAGS)

-! $(CFG)
+! $(STCCFG)
+
+
+!include $(WXDIR)\src\makelib.b32
+
+{$(S)}.cpp.obj:
+       bcc32 $(STCCPPFLAGS) -P -c {$< }
+
+.$(SRCSUFF).obj:
+       bcc32 $(STCCPPFLAGS) -c {$< }