RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

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

Browse Source 
Fixes compilation in VS
This commit is contained in:
Danila Malyutin 2016-04-08 21:17:24 +03:00 committed by Raul Tambre
parent d846eac0f1
commit 6b5ee57718
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Utilities/rXml.cpp
View File

@ -1,9 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "Utilities/rXml.h" #include "Utilities/rXml.h"
#pragma warning(push)
#pragma warning(disable : 4996)
#include <pugixml.hpp>
#pragma warning(pop)
rXmlNode::rXmlNode() rXmlNode::rXmlNode()
{ {

6
Utilities/rXml.h
View File

@ -1,6 +1,10 @@
#pragma once #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 struct rXmlNode
{ {

1
rpcs3/CMakeLists.txt
View File

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