diff --git a/Utilities/rXml.cpp b/Utilities/rXml.cpp index 1e0dfff1b5..aab1a84aa0 100644 --- 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 -#pragma warning(pop) rXmlNode::rXmlNode() { diff --git a/Utilities/rXml.h b/Utilities/rXml.h index 08edf5f934..3c369a09cd 100644 --- a/Utilities/rXml.h +++ b/Utilities/rXml.h @@ -1,6 +1,10 @@ #pragma once -#include +#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 index cae5fdd3d5..acb109e08e 100644 --- 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"