From 62d3e9784df18b8e41a1521c84223eee38551375 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 15 Dec 2014 21:34:22 +0100 Subject: [PATCH] Don't compile in xml_compat code --- Makefile.common | 12 ++++++------ griffin/griffin.c | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.common b/Makefile.common index 7bbdfdbc49..438702959f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -508,12 +508,12 @@ ifeq ($(HAVE_D3D9), 1) endif endif -ifeq ($(HAVE_LIBXML2), 1) - LIBS += $(LIBXML2_LIBS) - DEFINES += $(LIBXML2_CFLAGS) -else - OBJ += compat/rxml/rxml.o -endif +#ifeq ($(HAVE_LIBXML2), 1) + #LIBS += $(LIBXML2_LIBS) + #DEFINES += $(LIBXML2_CFLAGS) +#else + #OBJ += compat/rxml/rxml.o +#endif # Compression/Archive diff --git a/griffin/griffin.c b/griffin/griffin.c index 4a09df84bf..8d4b859d7f 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -762,10 +762,13 @@ DEPENDENCIES /*============================================================ XML ============================================================ */ +#if 0 #ifndef HAVE_LIBXML2 #define RXML_LIBXML2_COMPAT #include "../compat/rxml/rxml.c" #endif +#endif + /*============================================================ SETTINGS ============================================================ */