aports/testing/emulationstation/pugixml.patch

152 lines
4.6 KiB
Diff

diff --git a/es-app/src/CollectionSystemManager.cpp b/es-app/src/CollectionSystemManager.cpp
index 52dca51..30f62cd 100644
--- a/es-app/src/CollectionSystemManager.cpp
+++ b/es-app/src/CollectionSystemManager.cpp
@@ -12,7 +12,7 @@
#include "Settings.h"
#include "SystemData.h"
#include "ThemeData.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
#include <fstream>
std::string myCollectionsName = "collections";
diff --git a/es-app/src/Gamelist.cpp b/es-app/src/Gamelist.cpp
index 0dd89ca..c74d14e 100644
--- a/es-app/src/Gamelist.cpp
+++ b/es-app/src/Gamelist.cpp
@@ -8,7 +8,7 @@
#include "Log.h"
#include "Settings.h"
#include "SystemData.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
FileData* findOrCreateFile(SystemData* system, const std::string& path, FileType type)
{
diff --git a/es-app/src/MetaData.cpp b/es-app/src/MetaData.cpp
index 4841030..a71a500 100644
--- a/es-app/src/MetaData.cpp
+++ b/es-app/src/MetaData.cpp
@@ -2,7 +2,7 @@
#include "utils/FileSystemUtil.h"
#include "Log.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
MetaDataDecl gameDecls[] = {
// key, type, default, statistic, name in GuiMetaDataEd, prompt in GuiMetaDataEd
diff --git a/es-app/src/SystemData.h b/es-app/src/SystemData.h
index 688bc80..5a2e8fa 100644
--- a/es-app/src/SystemData.h
+++ b/es-app/src/SystemData.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
class FileData;
class FileFilterIndex;
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index 9ca9f20..d92841c 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -10,7 +10,7 @@
#include "Settings.h"
#include "SystemData.h"
#include "utils/TimeUtil.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
/* When raspbian will get an up to date version of rapidjson we'll be
able to have it throw in case of error with the following:
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 8cd59eb..cb2f594 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -7,7 +7,7 @@
#include "PlatformId.h"
#include "Settings.h"
#include "SystemData.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
#include <cstring>
using namespace PlatformIds;
diff --git a/es-core/src/InputConfig.cpp b/es-core/src/InputConfig.cpp
index 3a85ebb..56a6863 100644
--- a/es-core/src/InputConfig.cpp
+++ b/es-core/src/InputConfig.cpp
@@ -2,7 +2,7 @@
#include "Log.h"
#include "utils/StringUtil.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
//some util functions
std::string inputTypeToString(InputType type)
diff --git a/es-core/src/InputManager.cpp b/es-core/src/InputManager.cpp
index 94e18ef..67a8901 100644
--- a/es-core/src/InputManager.cpp
+++ b/es-core/src/InputManager.cpp
@@ -6,7 +6,7 @@
#include "platform.h"
#include "Scripting.h"
#include "Window.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
#include <SDL.h>
#include <iostream>
#include <assert.h>
diff --git a/es-core/src/MameNames.cpp b/es-core/src/MameNames.cpp
index e0dee5c..f05e864 100644
--- a/es-core/src/MameNames.cpp
+++ b/es-core/src/MameNames.cpp
@@ -3,7 +3,7 @@
#include "resources/ResourceManager.h"
#include "utils/FileSystemUtil.h"
#include "Log.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
#include <string.h>
MameNames* MameNames::sInstance = nullptr;
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index d38bf95..d9a2ae0 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -4,7 +4,7 @@
#include "Log.h"
#include "Scripting.h"
#include "platform.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
#include <algorithm>
#include <vector>
diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp
index 52a35c6..c223978 100644
--- a/es-core/src/ThemeData.cpp
+++ b/es-core/src/ThemeData.cpp
@@ -7,7 +7,7 @@
#include "Log.h"
#include "platform.h"
#include "Settings.h"
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
#include <algorithm>
std::vector<std::string> ThemeData::sSupportedViews { { "system" }, { "basic" }, { "detailed" }, { "grid" }, { "video" } };
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 03b743b..deec3de 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -2,4 +2,3 @@
# package managers are included with the project (in the 'external' folder)
add_subdirectory("nanosvg")
-add_subdirectory("pugixml")