projects/aports·blob master · refs

152 lines · 4.6 KiB

1diff --git a/es-app/src/CollectionSystemManager.cpp b/es-app/src/CollectionSystemManager.cpp
2index 52dca51..30f62cd 100644
3--- a/es-app/src/CollectionSystemManager.cpp
4+++ b/es-app/src/CollectionSystemManager.cpp
5@@ -12,7 +12,7 @@
6 #include "Settings.h"
7 #include "SystemData.h"
8 #include "ThemeData.h"
9-#include <pugixml/src/pugixml.hpp>
10+#include <pugixml.hpp>
11 #include <fstream>
12
13 std::string myCollectionsName = "collections";
14diff --git a/es-app/src/Gamelist.cpp b/es-app/src/Gamelist.cpp
15index 0dd89ca..c74d14e 100644
16--- a/es-app/src/Gamelist.cpp
17+++ b/es-app/src/Gamelist.cpp
18@@ -8,7 +8,7 @@
19 #include "Log.h"
20 #include "Settings.h"
21 #include "SystemData.h"
22-#include <pugixml/src/pugixml.hpp>
23+#include <pugixml.hpp>
24
25 FileData* findOrCreateFile(SystemData* system, const std::string& path, FileType type)
26 {
27diff --git a/es-app/src/MetaData.cpp b/es-app/src/MetaData.cpp
28index 4841030..a71a500 100644
29--- a/es-app/src/MetaData.cpp
30+++ b/es-app/src/MetaData.cpp
31@@ -2,7 +2,7 @@
32
33 #include "utils/FileSystemUtil.h"
34 #include "Log.h"
35-#include <pugixml/src/pugixml.hpp>
36+#include <pugixml.hpp>
37
38 MetaDataDecl gameDecls[] = {
39 // key, type, default, statistic, name in GuiMetaDataEd, prompt in GuiMetaDataEd
40diff --git a/es-app/src/SystemData.h b/es-app/src/SystemData.h
41index 688bc80..5a2e8fa 100644
42--- a/es-app/src/SystemData.h
43+++ b/es-app/src/SystemData.h
44@@ -9,7 +9,7 @@
45 #include <string>
46 #include <vector>
47
48-#include <pugixml/src/pugixml.hpp>
49+#include <pugixml.hpp>
50
51 class FileData;
52 class FileFilterIndex;
53diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
54index 9ca9f20..d92841c 100644
55--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
56+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
57@@ -10,7 +10,7 @@
58 #include "Settings.h"
59 #include "SystemData.h"
60 #include "utils/TimeUtil.h"
61-#include <pugixml/src/pugixml.hpp>
62+#include <pugixml.hpp>
63
64 /* When raspbian will get an up to date version of rapidjson we'll be
65 able to have it throw in case of error with the following:
66diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
67index 8cd59eb..cb2f594 100644
68--- a/es-app/src/scrapers/ScreenScraper.cpp
69+++ b/es-app/src/scrapers/ScreenScraper.cpp
70@@ -7,7 +7,7 @@
71 #include "PlatformId.h"
72 #include "Settings.h"
73 #include "SystemData.h"
74-#include <pugixml/src/pugixml.hpp>
75+#include <pugixml.hpp>
76 #include <cstring>
77
78 using namespace PlatformIds;
79diff --git a/es-core/src/InputConfig.cpp b/es-core/src/InputConfig.cpp
80index 3a85ebb..56a6863 100644
81--- a/es-core/src/InputConfig.cpp
82+++ b/es-core/src/InputConfig.cpp
83@@ -2,7 +2,7 @@
84
85 #include "Log.h"
86 #include "utils/StringUtil.h"
87-#include <pugixml/src/pugixml.hpp>
88+#include <pugixml.hpp>
89
90 //some util functions
91 std::string inputTypeToString(InputType type)
92diff --git a/es-core/src/InputManager.cpp b/es-core/src/InputManager.cpp
93index 94e18ef..67a8901 100644
94--- a/es-core/src/InputManager.cpp
95+++ b/es-core/src/InputManager.cpp
96@@ -6,7 +6,7 @@
97 #include "platform.h"
98 #include "Scripting.h"
99 #include "Window.h"
100-#include <pugixml/src/pugixml.hpp>
101+#include <pugixml.hpp>
102 #include <SDL.h>
103 #include <iostream>
104 #include <assert.h>
105diff --git a/es-core/src/MameNames.cpp b/es-core/src/MameNames.cpp
106index e0dee5c..f05e864 100644
107--- a/es-core/src/MameNames.cpp
108+++ b/es-core/src/MameNames.cpp
109@@ -3,7 +3,7 @@
110 #include "resources/ResourceManager.h"
111 #include "utils/FileSystemUtil.h"
112 #include "Log.h"
113-#include <pugixml/src/pugixml.hpp>
114+#include <pugixml.hpp>
115 #include <string.h>
116
117 MameNames* MameNames::sInstance = nullptr;
118diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
119index d38bf95..d9a2ae0 100644
120--- a/es-core/src/Settings.cpp
121+++ b/es-core/src/Settings.cpp
122@@ -4,7 +4,7 @@
123 #include "Log.h"
124 #include "Scripting.h"
125 #include "platform.h"
126-#include <pugixml/src/pugixml.hpp>
127+#include <pugixml.hpp>
128 #include <algorithm>
129 #include <vector>
130
131diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp
132index 52a35c6..c223978 100644
133--- a/es-core/src/ThemeData.cpp
134+++ b/es-core/src/ThemeData.cpp
135@@ -7,7 +7,7 @@
136 #include "Log.h"
137 #include "platform.h"
138 #include "Settings.h"
139-#include <pugixml/src/pugixml.hpp>
140+#include <pugixml.hpp>
141 #include <algorithm>
142
143 std::vector<std::string> ThemeData::sSupportedViews { { "system" }, { "basic" }, { "detailed" }, { "grid" }, { "video" } };
144diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
145index 03b743b..deec3de 100644
146--- a/external/CMakeLists.txt
147+++ b/external/CMakeLists.txt
148@@ -2,4 +2,3 @@
149 # package managers are included with the project (in the 'external' folder)
150
151 add_subdirectory("nanosvg")
152-add_subdirectory("pugixml")