regenerated makefiles

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

diff --git a/contrib/build/xrc/xrc.bkl b/contrib/build/xrc/xrc.bkl
index def2c4a83316647b0db1b94565e3e02979e8f39d..6a2022558f96a5e57e31f235eb9761b32c44a651 100644 (file)
--- a/contrib/build/xrc/xrc.bkl
+++ b/contrib/build/xrc/xrc.bkl
@@ -6,15 +6,8 @@
     <include file="../../../build/bakefiles/common_contrib.bkl"/>
 
     <set var="XRC_SRC">
-        <!-- expat: FIXME, use as external lib -->
-        expat/xmlparse/xmlparse.c
-        expat/xmltok/xmltok.c
-        expat/xmltok/xmlrole.c 
-
         <!-- the core: -->
-        xml.cpp
         xmlres.cpp
-        
         <!-- handlers: -->
         xh_bmp.cpp
         xh_bmpbt.cpp
@@ -42,6 +35,7 @@
         xh_slidr.cpp
         xh_spin.cpp
         xh_split.cpp
+        xh_statbar.cpp
         xh_stbmp.cpp
         xh_stbox.cpp
         xh_stlin.cpp
@@ -56,7 +50,6 @@
 
     <headers template="wx_contrib_headers">
         <files>
-            wx/xrc/xml.h
             wx/xrc/xmlres.h
             wx/xrc/xh_all.h
             wx/xrc/xh_bmp.h
@@ -85,6 +78,7 @@
             wx/xrc/xh_slidr.h
             wx/xrc/xh_spin.h
             wx/xrc/xh_split.h
+            wx/xrc/xh_statbar.h
             wx/xrc/xh_stbmp.h
             wx/xrc/xh_stbox.h
             wx/xrc/xh_stlin.h
@@ -98,12 +92,14 @@
     </headers>
 
     <dll id="xrcdll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXMAKINGDLL</define>
-        <include>$(SRCDIR)/expat/xmlparse</include>
-        <include>$(SRCDIR)/expat/xmltok</include>
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_XRC</define>
         <sources>$(XRC_SRC)</sources>
-        <wx-lib>core</wx-lib>
         <wx-lib>html</wx-lib>
+        <wx-lib>adv</wx-lib>
+        <wx-lib>core</wx-lib>
+        <wx-lib>xml</wx-lib>
+        <wx-lib>base</wx-lib>
     </dll>
     
     <lib id="xrclib" template="wx_contrib_lib" cond="SHARED=='0'">
@@ -111,5 +107,7 @@
         <include>$(SRCDIR)/expat/xmltok</include>
         <sources>$(XRC_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xrc=xrclib+xrcdll</set>
 
 </makefile>