Applied patch [ 795491 ] Multimon sample compatibility with various conditions

[wxWidgets.git] / contrib / build / gizmos / gizmos.bkl

diff --git a/contrib/build/gizmos/gizmos.bkl b/contrib/build/gizmos/gizmos.bkl
index 234dfdbc9bf6cf13c1bef4267d2c9bfd72a47be5..90752612bd2314d070f889dfeb983566229563cb 100644 (file)
--- a/contrib/build/gizmos/gizmos.bkl
+++ b/contrib/build/gizmos/gizmos.bkl
@@ -22,17 +22,22 @@
             wx/gizmos/multicell.h
             wx/gizmos/splittree.h
             wx/gizmos/statpict.h
+            wx/gizmos/gizmos.h
         </files>
     </headers>
 
     <dll id="gizmosdll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXMAKINGDLL</define>
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_GIZMOS</define>
         <sources>$(GIZMOS_SRC)</sources>
+        <wx-lib>base</wx-lib>
         <wx-lib>core</wx-lib>
     </dll>
-    
+
     <lib id="gizmoslib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(GIZMOS_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmoslib+gizmosdll</set>
 
 </makefile>