Make it easier to not use wxPopupWindow in wxSTC, and for now, don't

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

diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32
index 3d52701553c92b4b97c475d24ee1320131840385..0ac8176647195cdd0712327ba716ccbcab61d114 100644 (file)
--- a/contrib/src/stc/makefile.b32
+++ b/contrib/src/stc/makefile.b32
@@ -2,7 +2,7 @@
 # File:                makefile.b32
 # Author:      Julian Smart
 # Created:     1999
-# Updated:     
+# Updated:
 # Copyright:
 #
 # Makefile : Builds wxMMedia library for 32-bit BC++
@@ -14,42 +14,71 @@
 WXDIR = $(WXWIN)
 
 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
 
 OBJECTS = \
-       Accessor.obj    \
-       AutoComplete.obj        \
-       CallTip.obj     \
-       CellBuffer.obj  \
-       ContractionState.obj\
-       Document.obj    \
-       Editor.obj              \
-       Indicator.obj   \
-       KeyMap.obj              \
-       KeyWords.obj    \
-       LineMarker.obj  \
-       PropSet.obj     \
-       ScintillaBase.obj       \
-       Style.obj               \
-       ViewStyle.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                 \
 
-!include $(WXDIR)\src\makelib.b32
+STCCFG = stc.cfg
+STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
+
+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
@@ -64,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__
@@ -75,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 {$< }