Add various selection menu items to the sample.

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

diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index 17d7926df4ee71558aa1f5b1c4513f3438280178..cd1e8aac6b57f9f1f8dfbcad5bb82318f2d41677 100644 (file)
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -38,14 +38,21 @@
         <cppflags-borland>-w-8027</cppflags-borland>
     </template>
 
         <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"
          cond="USE_STC=='1' and BUILDING_LIB=='1'">
         <if cond="FORMAT!='autoconf'">
             <include>$(SETUPHDIR)</include>
             <include>$(TOP_SRCDIR)include</include>
         </if>
     <lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags"
          cond="USE_STC=='1' and BUILDING_LIB=='1'">
         <if cond="FORMAT!='autoconf'">
             <include>$(SETUPHDIR)</include>
             <include>$(TOP_SRCDIR)include</include>
         </if>

-        <define>WXUSINGDLL</define>
+        <define>$(wxscintilla_usingdll)</define>

         <define>__WX$(TOOLKIT)__</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