Drop the Array class added in the last scintilla patch and switch to using wxVector...

[wxWidgets.git] / build / bakefiles / scintilla.bkl

diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index d79cb7aab7e03897f30b1addc4c610aa8c697a4a..8fb073e65b9ba280281b7f16b67013e7c6c6eca7 100644 (file)
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -33,7 +33,13 @@
          cond="USE_STC=='1' and BUILDING_LIB=='1'">
         <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
         <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
+       <if cond="FORMAT!='autoconf'">
+         <include>$(SETUPHDIR)</include>
+         <include>$(TOP_SRCDIR)include</include>
+       </if>
+        <define>WXUSINGDLL</define>
         <define>__WX__</define>
+       <define>__WX$(TOOLKIT)__</define>
         <define>SCI_LEXER</define>
         <define>LINK_LEXERS</define>
         <dirname>$(LIBDIRNAME)</dirname>
@@ -52,8 +58,8 @@
             src/stc/scintilla/src/KeyMap.cxx
             src/stc/scintilla/src/KeyWords.cxx
             src/stc/scintilla/src/LexAPDL.cxx
-            src/stc/scintilla/src/LexAU3.cxx
             src/stc/scintilla/src/LexASY.cxx
+            src/stc/scintilla/src/LexAU3.cxx
             src/stc/scintilla/src/LexAVE.cxx
             src/stc/scintilla/src/LexAbaqus.cxx
             src/stc/scintilla/src/LexAda.cxx
@@ -64,14 +70,14 @@
             src/stc/scintilla/src/LexBasic.cxx
             src/stc/scintilla/src/LexBullant.cxx
             src/stc/scintilla/src/LexCLW.cxx
-            src/stc/scintilla/src/LexCmake.cxx
+            src/stc/scintilla/src/LexCOBOL.cxx
             src/stc/scintilla/src/LexCPP.cxx
             src/stc/scintilla/src/LexCSS.cxx
             src/stc/scintilla/src/LexCaml.cxx
-            src/stc/scintilla/src/LexCsound.cxx
-            src/stc/scintilla/src/LexCOBOL.cxx
+            src/stc/scintilla/src/LexCmake.cxx
             src/stc/scintilla/src/LexConf.cxx
             src/stc/scintilla/src/LexCrontab.cxx
+            src/stc/scintilla/src/LexCsound.cxx
             src/stc/scintilla/src/LexD.cxx
             src/stc/scintilla/src/LexEScript.cxx
             src/stc/scintilla/src/LexEiffel.cxx
@@ -88,10 +94,11 @@
             src/stc/scintilla/src/LexLisp.cxx
             src/stc/scintilla/src/LexLout.cxx
             src/stc/scintilla/src/LexLua.cxx
-            src/stc/scintilla/src/LexMagik.cxx
             src/stc/scintilla/src/LexMMIXAL.cxx
             src/stc/scintilla/src/LexMPT.cxx
             src/stc/scintilla/src/LexMSSQL.cxx
+            src/stc/scintilla/src/LexMagik.cxx
+            src/stc/scintilla/src/LexMarkdown.cxx
             src/stc/scintilla/src/LexMatlab.cxx
             src/stc/scintilla/src/LexMetapost.cxx
             src/stc/scintilla/src/LexMySQL.cxx
@@ -102,26 +109,26 @@
             src/stc/scintilla/src/LexPB.cxx
             src/stc/scintilla/src/LexPLM.cxx
             src/stc/scintilla/src/LexPOV.cxx
-            src/stc/scintilla/src/LexProgress.cxx
             src/stc/scintilla/src/LexPS.cxx
             src/stc/scintilla/src/LexPascal.cxx
             src/stc/scintilla/src/LexPerl.cxx
             src/stc/scintilla/src/LexPowerPro.cxx
             src/stc/scintilla/src/LexPowerShell.cxx
+            src/stc/scintilla/src/LexProgress.cxx
             src/stc/scintilla/src/LexPython.cxx
             src/stc/scintilla/src/LexR.cxx
             src/stc/scintilla/src/LexRebol.cxx
             src/stc/scintilla/src/LexRuby.cxx
-            src/stc/scintilla/src/LexSQL.cxx
             src/stc/scintilla/src/LexSML.cxx
-            src/stc/scintilla/src/LexSmalltalk.cxx
-            src/stc/scintilla/src/LexTADS3.cxx
+            src/stc/scintilla/src/LexSQL.cxx
             src/stc/scintilla/src/LexScriptol.cxx
-            src/stc/scintilla/src/LexSpecman.cxx
+            src/stc/scintilla/src/LexSmalltalk.cxx
             src/stc/scintilla/src/LexSorcus.cxx
+            src/stc/scintilla/src/LexSpecman.cxx
             src/stc/scintilla/src/LexSpice.cxx
-            src/stc/scintilla/src/LexTAL.cxx
             src/stc/scintilla/src/LexTACL.cxx
+            src/stc/scintilla/src/LexTADS3.cxx
+            src/stc/scintilla/src/LexTAL.cxx
             src/stc/scintilla/src/LexTCL.cxx
             src/stc/scintilla/src/LexTeX.cxx
             src/stc/scintilla/src/LexVB.cxx
@@ -134,16 +141,14 @@
             src/stc/scintilla/src/PropSet.cxx
             src/stc/scintilla/src/RESearch.cxx
             src/stc/scintilla/src/RunStyles.cxx
-            src/stc/scintilla/src/Selection.cxx
             src/stc/scintilla/src/ScintillaBase.cxx
+            src/stc/scintilla/src/Selection.cxx
             src/stc/scintilla/src/Style.cxx
             src/stc/scintilla/src/StyleContext.cxx
             src/stc/scintilla/src/UniConversion.cxx
             src/stc/scintilla/src/ViewStyle.cxx
             src/stc/scintilla/src/WindowAccessor.cxx
             src/stc/scintilla/src/XPM.cxx
-            src/stc/scintilla/src/LexMarkdown.cxx
-           src/stc/scintilla/src/Array.cpp
         </sources>
     </lib>