Changes to allow these build scripts to use python3

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

diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index 87b9477bb1a0b978526b236d6c08f41d149c6a8f..d59ac7a5d28e6523de005480f0acf282a24afd58 100644 (file)
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -15,8 +15,9 @@
         $(TOP_SRCDIR)src/stc/scintilla/include
     </set>
 
-    <!-- automatically update generated files -->
-    <fragment format='autoconf'>
+    <!-- automatically update generated files when building the library -->
+    <if cond="BUILDING_LIB=='1'">
+        <fragment format='autoconf'>
 @COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
 @COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
 @COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
@@ -25,15 +26,33 @@
 @COND_PYTHON@@COND_USE_STC_1@  cd $(srcdir)/src/stc &amp;&amp; ./gen_iface.py
 @COND_PYTHON@@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
 @COND_PYTHON@@COND_USE_STC_1@    $(srcdir)/include/wx/stc/stc.h
-    </fragment>
+        </fragment>
+    </if>
 
-    <lib id="wxscintilla" template="3rdparty_lib"
-         cond="USE_STC=='1' and BUILDING_LIB=='1'">
+    <template id="wxscintilla_cppflags">
         <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
         <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
         <define>__WX__</define>
         <define>SCI_LEXER</define>
         <define>LINK_LEXERS</define>
+        <cppflags-borland>-w-8027</cppflags-borland>
+    </template>
+
+    <set var="wxscintilla_usingdll">
+        <if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
+    </set>
+
+    <lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags,msvc_setup_h"
+         cond="USE_STC=='1' and BUILDING_LIB=='1'">
+        <if cond="FORMAT!='autoconf'">
+            <include>$(SETUPHDIR)</include>
+            <include>$(TOP_SRCDIR)include</include>
+        </if>
+        <define>$(wxscintilla_usingdll)</define>
+        <define>__WX$(TOOLKIT)__</define>
+        <define>$(WXUNIV_DEFINE)</define>
+        <define>$(DEBUG_DEFINE)</define>
+        <define>$(UNICODE_DEFINE)</define>
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             src/stc/scintilla/src/AutoComplete.cxx
@@ -50,8 +69,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
@@ -62,13 +81,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/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,28 +108,38 @@
             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
+            src/stc/scintilla/src/LexNimrod.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/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/LexSML.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/LexSmalltalk.cxx
+            src/stc/scintilla/src/LexSorcus.cxx
             src/stc/scintilla/src/LexSpecman.cxx
             src/stc/scintilla/src/LexSpice.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
@@ -117,11 +147,13 @@
             src/stc/scintilla/src/LexVerilog.cxx
             src/stc/scintilla/src/LexYAML.cxx
             src/stc/scintilla/src/LineMarker.cxx
+            src/stc/scintilla/src/PerLine.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/Selection.cxx
             src/stc/scintilla/src/Style.cxx
             src/stc/scintilla/src/StyleContext.cxx
             src/stc/scintilla/src/UniConversion.cxx
@@ -131,7 +163,7 @@
         </sources>
     </lib>
 
-    <!-- use this to conditonally link against wxscintilla with <library>: -->
+    <!-- used to conditionally link against wxscintilla only if it's enabled -->
     <set var="wxscintilla_library_link">
         <if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>
     </set>