rXml: use pugixml in header-only mode (#1665)

Fixes compilation in VS
RPCS3 · Apr 8, 2016 · 6b5ee57 · 6b5ee57
1 parent d846eac
commit 6b5ee57
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Utilities/rXml.cpp b/Utilities/rXml.cpp
@@ -1,9 +1,5 @@
 #include "stdafx.h"
 #include "Utilities/rXml.h"
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#include <pugixml.hpp>
-#pragma warning(pop)
 
 rXmlNode::rXmlNode()
 {

diff --git a/Utilities/rXml.h b/Utilities/rXml.h
@@ -1,6 +1,10 @@
 #pragma once
 
-#include <pugixml.hpp>
+#ifndef PUGIXML_HEADER_ONLY
+#define PUGIXML_HEADER_ONLY 1
+#endif // !PUGIXML_HEADER_ONLY
+#include "pugixml.hpp"
+#undef PUGIXML_HEADER_ONLY
 
 struct rXmlNode
 {

diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
@@ -165,7 +165,6 @@ endforeach()
 file(
 GLOB_RECURSE
 RPCS3_SRC
-"${RPCS3_SRC_DIR}/../3rdparty/pugixml/src/pugixml.cpp"
 "${RPCS3_SRC_DIR}/rpcs3.cpp"
 "${RPCS3_SRC_DIR}/config.cpp"
 "${RPCS3_SRC_DIR}/stb_image.cpp"