added HP-UX names for ISO8859-x charsets

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

diff --git a/build/bakefiles/expat.bkl b/build/bakefiles/expat.bkl
index 5923b07cf7b8ecf1710f0a118c4695c61fd75e3e..cd783e312edc2ba09b284937eab8669ecb46ee88 100644 (file)
--- a/build/bakefiles/expat.bkl
+++ b/build/bakefiles/expat.bkl
@@ -13,7 +13,7 @@
         <set var="wxUSE_EXPAT">builtin</set>
         <set var="LIB_EXPAT">
             <if cond="wxUSE_EXPAT=='builtin'">
-                wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
+                wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
             </if>
         </set>
     </if>
@@ -29,6 +29,9 @@
         <define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             COMPILED_FROM_DSP
         </define>
+        <define cond="FORMAT=='watcom' and PLATFORM_OS2=='1'">
+            OS2_32
+        </define>
         <cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
         <sources>
             src/expat/lib/xmlparse.c