synchronize GTK2 minimum version in docs

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

diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index 8fb073e65b9ba280281b7f16b67013e7c6c6eca7..d59ac7a5d28e6523de005480f0acf282a24afd58 100644 (file)
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -29,19 +29,30 @@
         </fragment>
     </if>
 
         </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>
         <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__</define>

-       <define>__WX$(TOOLKIT)__</define>

         <define>SCI_LEXER</define>
         <define>LINK_LEXERS</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
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             src/stc/scintilla/src/AutoComplete.cxx


@@ -152,7 +163,7 @@
         </sources>
     </lib>
 
         </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>
     <set var="wxscintilla_library_link">
         <if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>
     </set>