fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

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

diff --git a/contrib/build/gizmos/gizmos.bkl b/contrib/build/gizmos/gizmos.bkl
index 66c69db7ed56dbddf2e25f211aa4cf8dd5aff386..828e4942923a134bc5747959c2ece6fb1a739f18 100644 (file)
--- a/contrib/build/gizmos/gizmos.bkl
+++ b/contrib/build/gizmos/gizmos.bkl
@@ -13,6 +13,10 @@
         splittree.cpp
         statpict.cpp
     </set>
+    
+    <set var="GIZMOS_XRC_SRC">
+        xh_statpict.cpp
+    </set>
 
     <headers template="wx_contrib_headers">
         <files>
@@ -22,6 +26,8 @@
             wx/gizmos/multicell.h
             wx/gizmos/splittree.h
             wx/gizmos/statpict.h
+            wx/gizmos/gizmos.h
+            wx/gizmos/xh_statpict.h
         </files>
     </headers>
 
@@ -29,12 +35,32 @@
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GIZMOS</define>
         <sources>$(GIZMOS_SRC)</sources>
-        <wx-lib>base</wx-lib>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
     </dll>
     
+    <dll id="gizmos_xrcdll" template="wx_contrib_dll"
+         cond="SHARED=='1' and USE_XRC=='1'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_GIZMOS_XRC</define>
+        <sources>$(GIZMOS_XRC_SRC)</sources>
+        <library>gizmosdll</library>
+        <wx-lib>xrc</wx-lib>
+        <wx-lib>xml</wx-lib>
+        <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
+    </dll>
+
     <lib id="gizmoslib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(GIZMOS_SRC)</sources>
     </lib>
 
+    <lib id="gizmos_xrclib" template="wx_contrib_lib"
+         cond="SHARED=='0' and USE_XRC=='1'">
+        <sources>$(GIZMOS_XRC_SRC)</sources>
+    </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmoslib+gizmosdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos_xrc=gizmos_xrclib+gizmos_xrcdll</set>
+
 </makefile>