Use ldflags instead of ldlibs, because wx-config --libs mixes libs and ldflags, and...

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

diff --git a/build/bakefiles/common_contrib.bkl b/build/bakefiles/common_contrib.bkl
index feb1d67469eb44169b1589d493edcbd423a45f49..4c95e7d2ad0734cd14eb6ec5aa226fa7a0cf77dc 100644 (file)
--- a/build/bakefiles/common_contrib.bkl
+++ b/build/bakefiles/common_contrib.bkl
@@ -33,5 +33,18 @@
     
     <template id="wx_contrib_headers">
         <srcdir>$(CONTRIB_HDR_DIR)</srcdir>
+        <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>