added .chm support for Unix (Markus Sinner)

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

diff --git a/contrib/build/xrc/xrc.bkl b/contrib/build/xrc/xrc.bkl
index def2c4a83316647b0db1b94565e3e02979e8f39d..3a6f12564eff7a62c40d0a911375008b49f343d8 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">
     <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: -->
         <!-- the core: -->

-        xml.cpp

         xmlres.cpp
         xmlres.cpp

-        

         <!-- handlers: -->
         xh_bmp.cpp
         xh_bmpbt.cpp
         <!-- handlers: -->
         xh_bmp.cpp
         xh_bmpbt.cpp


@@ -56,7 +49,6 @@
 
     <headers template="wx_contrib_headers">
         <files>
 
     <headers template="wx_contrib_headers">
         <files>

-            wx/xrc/xml.h

             wx/xrc/xmlres.h
             wx/xrc/xh_all.h
             wx/xrc/xh_bmp.h
             wx/xrc/xmlres.h
             wx/xrc/xh_all.h
             wx/xrc/xh_bmp.h


@@ -98,12 +90,14 @@
     </headers>
 
     <dll id="xrcdll" template="wx_contrib_dll" cond="SHARED=='1'">
     </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>
         <sources>$(XRC_SRC)</sources>

-        <wx-lib>core</wx-lib>

         <wx-lib>html</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'">
     </dll>
     
     <lib id="xrclib" template="wx_contrib_lib" cond="SHARED=='0'">


@@ -111,5 +105,7 @@
         <include>$(SRCDIR)/expat/xmltok</include>
         <sources>$(XRC_SRC)</sources>
     </lib>
         <include>$(SRCDIR)/expat/xmltok</include>
         <sources>$(XRC_SRC)</sources>
     </lib>

+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xrc=xrclib+xrcdll</set>

 
 </makefile>
 
 </makefile>