mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 17:34:57 +00:00
- Turn on libxml2 support in msxml3.dll.
- Move libxml2 includes to include/reactos/libs/libxml. - Add one reactos-specific hack into libxml2/trionan.c (fpclassify-related). - With a number of glitches in msi, ole32 and rpcrt4, I was able to half-complete the Office 2003 setup. svn path=/trunk/; revision=31514
This commit is contained in:
parent
0c9e6b6cac
commit
bd85b22ea9
53 changed files with 10 additions and 4 deletions
|
@ -9,9 +9,12 @@
|
|||
<define name="_WIN32_IE">0x600</define>
|
||||
<define name="_WIN32_WINNT">0x601</define>
|
||||
<define name="WINVER">0x501</define>
|
||||
<define name="LIBXML_STATIC" />
|
||||
<library>libxml2</library>
|
||||
<library>wine</library>
|
||||
<library>urlmon</library>
|
||||
<library>wininet</library>
|
||||
<library>ws2_32</library>
|
||||
<library>comctl32</library>
|
||||
<library>shell32</library>
|
||||
<library>shlwapi</library>
|
||||
|
|
|
@ -276,10 +276,10 @@
|
|||
/* #undef HAVE_LIBSOCKET */
|
||||
|
||||
/* Define if you have the libxml2 library */
|
||||
/* #undef HAVE_LIBXML2 */
|
||||
#define HAVE_LIBXML2
|
||||
|
||||
/* Define to 1 if you have the <libxml/parser.h> header file. */
|
||||
/* #undef HAVE_LIBXML_PARSER_H */
|
||||
#define HAVE_LIBXML_PARSER_H
|
||||
|
||||
/* Define to 1 if you have the `xpg4' library (-lxpg4). */
|
||||
/* #undef HAVE_LIBXPG4 */
|
||||
|
|
4
reactos/lib/3rdparty/3rdparty.rbuild
vendored
4
reactos/lib/3rdparty/3rdparty.rbuild
vendored
|
@ -13,9 +13,9 @@
|
|||
<directory name="libwine">
|
||||
<xi:include href="libwine/libwine.rbuild" />
|
||||
</directory>
|
||||
<!--directory name="libxml2">
|
||||
<directory name="libxml2">
|
||||
<xi:include href="libxml2/libxml2.rbuild" />
|
||||
</directory-->
|
||||
</directory>
|
||||
<directory name="mingw">
|
||||
<xi:include href="mingw/mingw.rbuild" />
|
||||
</directory>
|
||||
|
|
3
reactos/lib/3rdparty/libxml2/trionan.c
vendored
3
reactos/lib/3rdparty/libxml2/trionan.c
vendored
|
@ -57,6 +57,9 @@
|
|||
# include <fp_class.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Small ReactOS hack */
|
||||
#define fpclassify fpclass
|
||||
#include <assert.h>
|
||||
|
||||
#if defined(TRIO_DOCUMENTATION)
|
||||
|
|
Loading…
Reference in a new issue