11a3e7b6da
Merge with the latest version, mostly discarding our changes to 1.95.6 as they seem to be unnecessary any longer, keep just bakefile-specific addition to configure. Also update our own makefile to define HAVE_EXPAT_CONFIG_H which is now needed by Unix build. Closes #11677. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
52 lines
1.6 KiB
XML
52 lines
1.6 KiB
XML
<?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="INC_EXPAT">
|
|
<if cond="wxUSE_EXPAT=='builtin'">$(TOP_SRCDIR)src/expat/lib</if>
|
|
</set>
|
|
|
|
<lib id="wxexpat" template="3rdparty_lib"
|
|
cond="wxUSE_EXPAT=='builtin' and BUILDING_LIB=='1'">
|
|
<dirname>$(LIBDIRNAME)</dirname>
|
|
<include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
|
|
<include cond="FORMAT=='autoconf'">$(BUILDDIR)/src/expat</include>
|
|
<define cond="FORMAT=='autoconf'">
|
|
HAVE_EXPAT_CONFIG_H
|
|
</define>
|
|
<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
|
|
src/expat/lib/xmltok.c
|
|
</sources>
|
|
</lib>
|
|
|
|
</makefile>
|