moving out of 'carbon' dir

[wxWidgets.git] / build / bakefiles / expat.bkl

diff --git a/build/bakefiles/expat.bkl b/build/bakefiles/expat.bkl
index 578e011bd00c6e91833178b44e37acce24b15610..6e6925e5da7f2bfe5a55374a43593f2941daef28 100644 (file)
--- a/build/bakefiles/expat.bkl
+++ b/build/bakefiles/expat.bkl
@@ -1,15 +1,24 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
+
 <makefile>
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_EXPAT"/>
+        <set var="LIB_EXPAT">
+            <if cond="wxUSE_EXPAT=='builtin'">
+                wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+            </if>
+        </set>
     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="wxUSE_EXPAT">builtin</set>
+        <set var="LIB_EXPAT">
+            <if cond="wxUSE_EXPAT=='builtin'">
+                wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
+            </if>
+        </set>
     </if>
-    <set var="LIB_EXPAT">
-        <if cond="wxUSE_EXPAT=='builtin'">wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
-    </set>
     <set var="INC_EXPAT">
         <if cond="wxUSE_EXPAT=='builtin'">$(TOP_SRCDIR)src/expat/lib</if>
     </set>
@@ -19,6 +28,16 @@
         <dirname>$(LIBDIRNAME)</dirname>
         <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
         <include cond="FORMAT=='autoconf'">$(BUILDDIR)/src/expat</include>
+        <define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
+            COMPILED_FROM_DSP
+        </define>
+        <define cond="FORMAT=='watcom' and PLATFORM_OS2=='1'">
+            OS2_32
+        </define>
+        <define cond="FORMAT=='watcom' and PLATFORM_MSDOS=='1'">
+            __MSDOS__
+        </define>
+        <cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
         <sources>
             src/expat/lib/xmlparse.c
             src/expat/lib/xmlrole.c