Skip to content

Commit 6b5ee57

Browse files
danilamltambry
authored andcommitted
rXml: use pugixml in header-only mode (#1665)
Fixes compilation in VS
1 parent d846eac commit 6b5ee57

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Utilities/rXml.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#include "stdafx.h"
22
#include "Utilities/rXml.h"
3-
#pragma warning(push)
4-
#pragma warning(disable : 4996)
5-
#include <pugixml.hpp>
6-
#pragma warning(pop)
73

84
rXmlNode::rXmlNode()
95
{

Utilities/rXml.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#pragma once
22

3-
#include <pugixml.hpp>
3+
#ifndef PUGIXML_HEADER_ONLY
4+
#define PUGIXML_HEADER_ONLY 1
5+
#endif // !PUGIXML_HEADER_ONLY
6+
#include "pugixml.hpp"
7+
#undef PUGIXML_HEADER_ONLY
48

59
struct rXmlNode
610
{

rpcs3/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ endforeach()
165165
file(
166166
GLOB_RECURSE
167167
RPCS3_SRC
168-
"${RPCS3_SRC_DIR}/../3rdparty/pugixml/src/pugixml.cpp"
169168
"${RPCS3_SRC_DIR}/rpcs3.cpp"
170169
"${RPCS3_SRC_DIR}/config.cpp"
171170
"${RPCS3_SRC_DIR}/stb_image.cpp"

0 commit comments

Comments
 (0)