From 3935cef6916fb89876a91359a557d2f01d29b626 Mon Sep 17 00:00:00 2001
From: scribam <scribam@users.noreply.github.com>
Date: Thu, 7 Jun 2018 18:38:19 +0200
Subject: [PATCH] pugixml: update submodule and build integration

---
 3rdparty/pugixml     | 2 +-
 CMakeLists.txt       | 2 ++
 Utilities/rXml.h     | 6 +-----
 rpcs3/CMakeLists.txt | 3 +--
 rpcs3_default.props  | 1 +
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/3rdparty/pugixml b/3rdparty/pugixml
index 257fbb4e1b..8436f2a69b 160000
--- a/3rdparty/pugixml
+++ b/3rdparty/pugixml
@@ -1 +1 @@
-Subproject commit 257fbb4e1b09b0f1a6b2020ae2db190b87c8f9c7
+Subproject commit 8436f2a69b9331f8e99a52772e93ba0dbb68dafe
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 508432bbda..fd6feccb08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,8 @@ if (NOT USE_SYSTEM_LIBPNG)
 	add_subdirectory(3rdparty/libpng EXCLUDE_FROM_ALL)
 endif()
 
+add_subdirectory(3rdparty/pugixml EXCLUDE_FROM_ALL)
+
 # TODO: do real installation, including copying directory structure
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")
diff --git a/Utilities/rXml.h b/Utilities/rXml.h
index 704801fab7..ab5b2f1cb1 100644
--- a/Utilities/rXml.h
+++ b/Utilities/rXml.h
@@ -1,10 +1,6 @@
 #pragma once
 
-#ifndef PUGIXML_HEADER_ONLY
-#define PUGIXML_HEADER_ONLY 1
-#endif // !PUGIXML_HEADER_ONLY
-#include "pugixml.hpp"
-#undef PUGIXML_HEADER_ONLY
+#include <pugixml.hpp>
 
 struct rXmlNode
 {
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index be1aa45848..ceededea3b 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -289,7 +289,6 @@ endif()
 include_directories(
 ${OPENAL_INCLUDE_DIR}
 ${LLVM_INCLUDE_DIRS}
-"${RPCS3_SRC_DIR}/../3rdparty/pugixml/src"
 "${RPCS3_SRC_DIR}"
 "${RPCS3_SRC_DIR}/Loader"
 "${RPCS3_SRC_DIR}/Crypto"
@@ -401,7 +400,7 @@ if(VULKAN_FOUND)
 	target_link_libraries(rpcs3 SPIRV Vulkan::Vulkan)
 endif()
 
-target_link_libraries(rpcs3 xxhash yaml-cpp)
+target_link_libraries(rpcs3 pugixml xxhash yaml-cpp)
 
 if(WIN32)
 	target_link_libraries(rpcs3 ws2_32.lib Winmm.lib Psapi.lib gdi32.lib setupapi.lib hidapi-hid Shlwapi.lib)
diff --git a/rpcs3_default.props b/rpcs3_default.props
index 9655d9a279..51c5dac917 100644
--- a/rpcs3_default.props
+++ b/rpcs3_default.props
@@ -13,6 +13,7 @@
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
     </Lib>
     <ClCompile>
+      <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>false</SDLCheck>