diff --git a/Extras/COLLADA_DOM/Jamfile b/Extras/COLLADA_DOM/Jamfile index 63cccd0cc..5ac302620 100644 --- a/Extras/COLLADA_DOM/Jamfile +++ b/Extras/COLLADA_DOM/Jamfile @@ -14,12 +14,6 @@ Library collada-dom : ; -CFlags collada-dom : -[ FIncludes $(TOP)/Extras/COLLADA_DOM ] -[ FIncludes $(TOP)/Extras/COLLADA_DOM/include ] -[ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ] -[ FIncludes $(TOP)/Extras/LibXML/include ] -; LibDepends collada-dom : ; diff --git a/Extras/LibXML/configwin32.h b/Extras/LibXML/config-win32.h similarity index 100% rename from Extras/LibXML/configwin32.h rename to Extras/LibXML/config-win32.h diff --git a/Extras/LibXML/include/libxml/xmlversion.h b/Extras/LibXML/include/libxml/xmlversion.h index 416950812..8eae5d3ad 100644 --- a/Extras/LibXML/include/libxml/xmlversion.h +++ b/Extras/LibXML/include/libxml/xmlversion.h @@ -164,7 +164,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the FTP support is configured in */ -#if 1 +#if 0 #define LIBXML_FTP_ENABLED #endif @@ -173,7 +173,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the HTTP support is configured in */ -#if 1 +#if 0 #define LIBXML_HTTP_ENABLED #endif @@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether iconv support is available */ -#if 1 +#if 0 #define LIBXML_ICONV_ENABLED #endif @@ -281,7 +281,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether Debugging module is configured in */ -#if 1 +#if 0 #define LIBXML_DEBUG_ENABLED #endif diff --git a/Extras/LibXML/libxml.h b/Extras/LibXML/libxml.h index 696be62e7..6aec26925 100644 --- a/Extras/LibXML/libxml.h +++ b/Extras/LibXML/libxml.h @@ -21,8 +21,12 @@ #if defined(macintosh) #include "config-mac.h" #else +#ifdef _MSC_VER +#include "config-win32.h" +#else #include "config.h" #include +#endif //_MSC_VER #endif #if defined(__Lynx__)