Fix for MGL link error

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

diff --git a/contrib/build/deprecated/deprecated.bkl b/contrib/build/deprecated/deprecated.bkl
index 82afff29213ffca6054f329b953e98f4789c73b2..625f75b77afaa1aefe36da2877971c1b83d74ac8 100644 (file)
--- a/contrib/build/deprecated/deprecated.bkl
+++ b/contrib/build/deprecated/deprecated.bkl
@@ -10,7 +10,8 @@
         propform.cpp
         proplist.cpp
         resource.cpp
-        treelay.cpp
+        tbarsmpl.cpp
+        treelay.cpp        
         wxexpr.cpp
         
         <!--
@@ -28,6 +29,7 @@
             wx/deprecated/proplist.h
             wx/deprecated/resource.h
             wx/deprecated/setup.h
+            wx/deprecated/tbarsmpl.h
             wx/deprecated/treelay.h
             wx/deprecated/wxexpr.h
         </files>
@@ -36,14 +38,20 @@
     <dll id="deprecateddll" template="wx_contrib_dll" cond="SHARED=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_DEPRECATED</define>
+        <include>$(SRCDIR)</include>
         <sources>$(DEPRECATED_SRC)</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
+        <precomp-headers-exclude>dosyacc.c</precomp-headers-exclude>
     </dll>
     
     <lib id="deprecatedlib" template="wx_contrib_lib" cond="SHARED=='0'">
+        <include>$(SRCDIR)</include>
         <sources>$(DEPRECATED_SRC)</sources>
+        <precomp-headers-exclude>dosyacc.c</precomp-headers-exclude>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">deprecated=deprecatedlib+deprecateddll</set>
 
 </makefile>