Remove empty PalmOS-related directories.

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

diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index 817cfd129dcd8a65c5601982737fb99620cd3eda..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>

+        <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>
         <if cond="FORMAT!='autoconf'">
             <include>$(SETUPHDIR)</include>
             <include>$(TOP_SRCDIR)include</include>
         </if>

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

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

-        <define>SCI_LEXER</define>
-        <define>LINK_LEXERS</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