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 dfb993d3394940a91e764f4ae2f70c51cdc37152..d59ac7a5d28e6523de005480f0acf282a24afd58 100644 (file)
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -39,10 +39,10 @@
     </template>
 
     <set var="wxscintilla_usingdll">
-        <if cond="SHARED=='1'">WXUSINGDLL</if>
+        <if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
     </set>
 
-    <lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags"
+    <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>
@@ -50,6 +50,9 @@
         </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