X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/489c64e0e15c68e37b44f2b3df5c661f846e8a0c..01168e9591c6114140768de014695e3908922033:/build/bakefiles/expat.bkl

diff --git a/build/bakefiles/expat.bkl b/build/bakefiles/expat.bkl
index ef4f4e9f47..eea2ab082e 100644
--- a/build/bakefiles/expat.bkl
+++ b/build/bakefiles/expat.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_EXPAT">builtin</set>
     </if>
     <set var="LIB_EXPAT">
-        <if cond="wxUSE_EXPAT=='builtin'">wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
+        <if cond="wxUSE_EXPAT=='builtin'">wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</if>
     </set>
     <set var="INC_EXPAT">
         <if cond="wxUSE_EXPAT=='builtin'">$(TOP_SRCDIR)src/expat/lib</if>
@@ -22,6 +22,7 @@
         <define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             COMPILED_FROM_DSP
         </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