Emulation/EmulationStation-retropie
1
0
Fork 0
mirror of https://github.com/RetroPie/EmulationStation.git synced 2024-06-12 01:17:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix include paths of pugixml

Browse source
This commit is contained in:
Jacek Galowicz 2023-07-24 13:16:07 +02:00
parent 30cbdeb7cd
commit 58750da873
13 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/src/CollectionSystemManager.cpp
View file

@ -12,7 +12,7 @@
#include "Settings.h" #include "Settings.h"
#include "SystemData.h" #include "SystemData.h"
#include "ThemeData.h" #include "ThemeData.h"
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
#include <fstream> #include <fstream>
std::string myCollectionsName = "collections"; std::string myCollectionsName = "collections";

2
es-app/src/Gamelist.cpp
View file

@ -8,7 +8,7 @@
#include "Log.h" #include "Log.h"
#include "Settings.h" #include "Settings.h"
#include "SystemData.h" #include "SystemData.h"
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
FileData* findOrCreateFile(SystemData* system, const std::string& path, FileType type) FileData* findOrCreateFile(SystemData* system, const std::string& path, FileType type)
{ {

2
es-app/src/MetaData.cpp
View file

@ -2,7 +2,7 @@
#include "utils/FileSystemUtil.h" #include "utils/FileSystemUtil.h"
#include "Log.h" #include "Log.h"
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
MetaDataDecl gameDecls[] = { MetaDataDecl gameDecls[] = {
// key, type, default, statistic, name in GuiMetaDataEd, prompt in GuiMetaDataEd // key, type, default, statistic, name in GuiMetaDataEd, prompt in GuiMetaDataEd

2
es-app/src/SystemData.h
View file

@ -9,7 +9,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
class FileData; class FileData;
class FileFilterIndex; class FileFilterIndex;

2
es-app/src/scrapers/GamesDBJSONScraper.cpp
View file

@ -10,7 +10,7 @@
#include "Settings.h" #include "Settings.h"
#include "SystemData.h" #include "SystemData.h"
#include "utils/TimeUtil.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 /* 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: able to have it throw in case of error with the following:

2
es-app/src/scrapers/ScreenScraper.cpp
View file

@ -7,7 +7,7 @@
#include "PlatformId.h" #include "PlatformId.h"
#include "Settings.h" #include "Settings.h"
#include "SystemData.h" #include "SystemData.h"
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
#include <cstring> #include <cstring>
using namespace PlatformIds; using namespace PlatformIds;

2
es-core/src/InputConfig.cpp
View file

@ -2,7 +2,7 @@
#include "Log.h" #include "Log.h"
#include "utils/StringUtil.h" #include "utils/StringUtil.h"
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
//some util functions //some util functions
std::string inputTypeToString(InputType type) std::string inputTypeToString(InputType type)

2
es-core/src/InputManager.cpp
View file

@ -6,7 +6,7 @@
#include "platform.h" #include "platform.h"
#include "Scripting.h" #include "Scripting.h"
#include "Window.h" #include "Window.h"
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
#include <SDL.h> #include <SDL.h>
#include <iostream> #include <iostream>
#include <assert.h> #include <assert.h>

2
es-core/src/MameNames.cpp
View file

@ -3,7 +3,7 @@
#include "resources/ResourceManager.h" #include "resources/ResourceManager.h"
#include "utils/FileSystemUtil.h" #include "utils/FileSystemUtil.h"
#include "Log.h" #include "Log.h"
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
#include <string.h> #include <string.h>
MameNames* MameNames::sInstance = nullptr; MameNames* MameNames::sInstance = nullptr;

2
es-core/src/Settings.cpp
View file

@ -4,7 +4,7 @@
#include "Log.h" #include "Log.h"
#include "Scripting.h" #include "Scripting.h"
#include "platform.h" #include "platform.h"
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>

2
es-core/src/ThemeData.cpp
View file

@ -7,7 +7,7 @@
#include "Log.h" #include "Log.h"
#include "platform.h" #include "platform.h"
#include "Settings.h" #include "Settings.h"
#include <pugixml/src/pugixml.hpp> #include <pugixml.hpp>
#include <algorithm> #include <algorithm>
std::vector<std::string> ThemeData::sSupportedViews { { "system" }, { "basic" }, { "detailed" }, { "grid" }, { "video" } }; std::vector<std::string> ThemeData::sSupportedViews { { "system" }, { "basic" }, { "detailed" }, { "grid" }, { "video" } };

7
external/CMakeLists.txt vendored
View file

@ -2,4 +2,9 @@
# package managers are included with the project (in the 'external' folder) # package managers are included with the project (in the 'external' folder)
add_subdirectory("nanosvg") add_subdirectory("nanosvg")
add_subdirectory("pugixml")
find_package(pugixml)
if(NOT pugixml_FOUND)
add_subdirectory("pugixml")
endif()

2
external/pugixml vendored

@ -1 +1 @@
Subproject commit d2deb420bc70369faa12785df2b5dd4d390e523d Subproject commit a0e064336317c9347a91224112af9933598714e9