forgot to commit

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

diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index 42521ee7ed0b58ab8dd82921022020c8600a3b34..4c36b10ccbb9a2ae38cd5818bd700e8e8797d27e 100644 (file)
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -16,7 +16,7 @@
     </set>
 
     <lib id="wxscintilla" template="3rdparty_lib"
     </set>
 
     <lib id="wxscintilla" template="3rdparty_lib"

-         cond="BUILDING_LIB=='1'">
+         cond="USE_STC=='1' and BUILDING_LIB=='1'">

         <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
         <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
         <define>__WX__</define>
         <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
         <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
         <define>__WX__</define>


@@ -107,5 +107,10 @@
            src/stc/scintilla/src/XPM.cxx
         </sources>
     </lib>
            src/stc/scintilla/src/XPM.cxx
         </sources>
     </lib>

+    
+    <!-- use this to conditonally link against wxscintilla with <library>: -->
+    <set var="wxscintilla_library_link">
+        <if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>
+    </set>

 
 </makefile>
 
 </makefile>