X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e83a52a25afbf21b0c946d787358527dc1f1c8b3..5cd47bd76a0714c9d3e6e315a635c98cbc771c95:/build/bakefiles/common_contrib.bkl

diff --git a/build/bakefiles/common_contrib.bkl b/build/bakefiles/common_contrib.bkl
index de7cd1f9e6..4c95e7d2ad 100644
--- a/build/bakefiles/common_contrib.bkl
+++ b/build/bakefiles/common_contrib.bkl
@@ -7,7 +7,7 @@
         <include file="common.bkl"/>
     </if>
     
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../include</set>
+    <set var="CONTRIB_HDR_DIR" overwrite="0">$(SRCDIR)/../../include</set>
     
     <!-- =============================================================== -->
     <!--                      Contrib lib helpers:                       -->
@@ -21,16 +21,30 @@
         <template id="wx_contrib_sample" template="wx_sample">
             <include>$(CONTRIB_HDR_DIR)</include>
         </template>
+        <template id="wx_contrib_util" template="wx_util">
+            <include>$(CONTRIB_HDR_DIR)</include>
+        </template>
     </if>
     
     <template id="wx_contrib_dll"
               template="wx_dll_b" template_append="wx_append">
         <include>$(CONTRIB_HDR_DIR)</include>
     </template>
-
     
     <template id="wx_contrib_headers">
         <srcdir>$(CONTRIB_HDR_DIR)</srcdir>
-    </template>    
-    
+        <install-to>$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)</install-to>
+    </template>
+
+    <!-- Link against one contrib library. Value must be literal! -->
+    <define-tag name="contrib-lib" rules="exe,dll,module">
+        <sys-lib>$(wxwin.libToLink(value))</sys-lib>
+        <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
+        <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
+            <depends-on-dsp>
+                $(wxwin.makeContribDspDependency(value))
+            </depends-on-dsp>
+        </if>
+    </define-tag>
+
 </makefile>