X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7708a267207473783f88cae047b78adaecf83675..6d595f3d7abc59d903dba5c8d9e6dd082f7b4671:/build/bakefiles/scintilla.bkl

diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index 16a48e676b..e7f27fb2ba 100644
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -15,6 +15,18 @@
         $(TOP_SRCDIR)src/stc/scintilla/include
     </set>
 
+    <!-- automatically update generated files -->
+    <fragment format='autoconf'>
+@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
+@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
+@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
+@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
+@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
+@COND_USE_STC_1@	cd $(srcdir)/src/stc &amp;&amp; ./gen_iface.py
+@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
+@COND_USE_STC_1@    $(srcdir)/include/wx/stc/stc.h
+    </fragment>
+
     <lib id="wxscintilla" template="3rdparty_lib"
          cond="USE_STC=='1' and BUILDING_LIB=='1'">
         <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
@@ -24,88 +36,104 @@
         <define>LINK_LEXERS</define>
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
-	    src/stc/scintilla/src/AutoComplete.cxx
-	    src/stc/scintilla/src/CallTip.cxx
-	    src/stc/scintilla/src/CellBuffer.cxx
-	    src/stc/scintilla/src/CharClassify.cxx
-	    src/stc/scintilla/src/ContractionState.cxx
-	    src/stc/scintilla/src/Document.cxx
-	    src/stc/scintilla/src/DocumentAccessor.cxx
-	    src/stc/scintilla/src/Editor.cxx
-	    src/stc/scintilla/src/ExternalLexer.cxx
-	    src/stc/scintilla/src/Indicator.cxx
-	    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/LexAVE.cxx
-	    src/stc/scintilla/src/LexAda.cxx
-	    src/stc/scintilla/src/LexAsm.cxx
-	    src/stc/scintilla/src/LexAsn1.cxx
-	    src/stc/scintilla/src/LexBaan.cxx
-	    src/stc/scintilla/src/LexBash.cxx
-	    src/stc/scintilla/src/LexBasic.cxx
-	    src/stc/scintilla/src/LexBullant.cxx
-	    src/stc/scintilla/src/LexCLW.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/LexConf.cxx
-	    src/stc/scintilla/src/LexCrontab.cxx
-	    src/stc/scintilla/src/LexEScript.cxx
-	    src/stc/scintilla/src/LexEiffel.cxx
-	    src/stc/scintilla/src/LexErlang.cxx
-	    src/stc/scintilla/src/LexFlagship.cxx
-	    src/stc/scintilla/src/LexForth.cxx
-	    src/stc/scintilla/src/LexFortran.cxx
-	    src/stc/scintilla/src/LexGui4Cli.cxx
-	    src/stc/scintilla/src/LexHTML.cxx
-	    src/stc/scintilla/src/LexHaskell.cxx
-	    src/stc/scintilla/src/LexInno.cxx
-	    src/stc/scintilla/src/LexKix.cxx
-	    src/stc/scintilla/src/LexLisp.cxx
-	    src/stc/scintilla/src/LexLout.cxx
-	    src/stc/scintilla/src/LexLua.cxx
-	    src/stc/scintilla/src/LexMMIXAL.cxx
-	    src/stc/scintilla/src/LexMPT.cxx
-	    src/stc/scintilla/src/LexMSSQL.cxx
-	    src/stc/scintilla/src/LexMatlab.cxx
-	    src/stc/scintilla/src/LexMetapost.cxx
-	    src/stc/scintilla/src/LexNsis.cxx
-	    src/stc/scintilla/src/LexOpal.cxx
-	    src/stc/scintilla/src/LexOthers.cxx
-	    src/stc/scintilla/src/LexPB.cxx
-	    src/stc/scintilla/src/LexPOV.cxx
-	    src/stc/scintilla/src/LexPS.cxx
-	    src/stc/scintilla/src/LexPascal.cxx
-	    src/stc/scintilla/src/LexPerl.cxx
-	    src/stc/scintilla/src/LexPython.cxx
-	    src/stc/scintilla/src/LexRebol.cxx
-	    src/stc/scintilla/src/LexRuby.cxx
-	    src/stc/scintilla/src/LexSQL.cxx
-	    src/stc/scintilla/src/LexSmalltalk.cxx
-	    src/stc/scintilla/src/LexTADS3.cxx
-	    src/stc/scintilla/src/LexScriptol.cxx
-	    src/stc/scintilla/src/LexSpecman.cxx
-	    src/stc/scintilla/src/LexSpice.cxx
-	    src/stc/scintilla/src/LexTCL.cxx
-	    src/stc/scintilla/src/LexTeX.cxx
-	    src/stc/scintilla/src/LexVB.cxx
-	    src/stc/scintilla/src/LexVHDL.cxx
-	    src/stc/scintilla/src/LexVerilog.cxx
-	    src/stc/scintilla/src/LexYAML.cxx
-	    src/stc/scintilla/src/LineMarker.cxx
-	    src/stc/scintilla/src/PropSet.cxx
-	    src/stc/scintilla/src/RESearch.cxx
-	    src/stc/scintilla/src/ScintillaBase.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/AutoComplete.cxx
+            src/stc/scintilla/src/CallTip.cxx
+            src/stc/scintilla/src/CellBuffer.cxx
+            src/stc/scintilla/src/CharClassify.cxx
+            src/stc/scintilla/src/ContractionState.cxx
+            src/stc/scintilla/src/Decoration.cxx
+            src/stc/scintilla/src/Document.cxx
+            src/stc/scintilla/src/DocumentAccessor.cxx
+            src/stc/scintilla/src/Editor.cxx
+            src/stc/scintilla/src/ExternalLexer.cxx
+            src/stc/scintilla/src/Indicator.cxx
+            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/LexAVE.cxx
+            src/stc/scintilla/src/LexAbaqus.cxx
+            src/stc/scintilla/src/LexAda.cxx
+            src/stc/scintilla/src/LexAsm.cxx
+            src/stc/scintilla/src/LexAsn1.cxx
+            src/stc/scintilla/src/LexBaan.cxx
+            src/stc/scintilla/src/LexBash.cxx
+            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/LexCPP.cxx
+            src/stc/scintilla/src/LexCSS.cxx
+            src/stc/scintilla/src/LexCaml.cxx
+            src/stc/scintilla/src/LexCsound.cxx
+            src/stc/scintilla/src/LexConf.cxx
+            src/stc/scintilla/src/LexCrontab.cxx
+            src/stc/scintilla/src/LexD.cxx
+            src/stc/scintilla/src/LexEScript.cxx
+            src/stc/scintilla/src/LexEiffel.cxx
+            src/stc/scintilla/src/LexErlang.cxx
+            src/stc/scintilla/src/LexFlagship.cxx
+            src/stc/scintilla/src/LexForth.cxx
+            src/stc/scintilla/src/LexFortran.cxx
+            src/stc/scintilla/src/LexGAP.cxx
+            src/stc/scintilla/src/LexGui4Cli.cxx
+            src/stc/scintilla/src/LexHTML.cxx
+            src/stc/scintilla/src/LexHaskell.cxx
+            src/stc/scintilla/src/LexInno.cxx
+            src/stc/scintilla/src/LexKix.cxx
+            src/stc/scintilla/src/LexLisp.cxx
+            src/stc/scintilla/src/LexLout.cxx
+            src/stc/scintilla/src/LexLua.cxx
+            src/stc/scintilla/src/LexMMIXAL.cxx
+            src/stc/scintilla/src/LexMPT.cxx
+            src/stc/scintilla/src/LexMSSQL.cxx
+            src/stc/scintilla/src/LexMatlab.cxx
+            src/stc/scintilla/src/LexMetapost.cxx
+            src/stc/scintilla/src/LexNsis.cxx
+            src/stc/scintilla/src/LexOpal.cxx
+            src/stc/scintilla/src/LexOthers.cxx
+            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/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/LexSmalltalk.cxx
+            src/stc/scintilla/src/LexTADS3.cxx
+            src/stc/scintilla/src/LexScriptol.cxx
+            src/stc/scintilla/src/LexSpecman.cxx
+            src/stc/scintilla/src/LexSpice.cxx
+            src/stc/scintilla/src/LexTCL.cxx
+            src/stc/scintilla/src/LexTeX.cxx
+            src/stc/scintilla/src/LexVB.cxx
+            src/stc/scintilla/src/LexVHDL.cxx
+            src/stc/scintilla/src/LexVerilog.cxx
+            src/stc/scintilla/src/LexYAML.cxx
+            src/stc/scintilla/src/LineMarker.cxx
+            src/stc/scintilla/src/PositionCache.cxx
+            src/stc/scintilla/src/PropSet.cxx
+            src/stc/scintilla/src/RESearch.cxx
+            src/stc/scintilla/src/RunStyles.cxx
+            src/stc/scintilla/src/ScintillaBase.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
         </sources>
     </lib>
 
+    <!-- use this to conditonally link against wxscintilla with <library>: -->
+    <set var="wxscintilla_library_link">
+        <if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>
+    </set>
+
 </makefile>