From 08888e00afef1ba8569ab4355814e06f05ecb7df Mon Sep 17 00:00:00 2001 From: Leon Styhre <leon@leonstyhre.com> Date: Wed, 6 Oct 2021 18:41:21 +0200 Subject: [PATCH] Clarified the use of bundled include files. --- es-app/src/scrapers/GamesDBJSONScraper.cpp | 5 +++-- es-app/src/scrapers/GamesDBJSONScraperResources.cpp | 5 +++-- es-core/src/resources/TextureData.cpp | 5 +++-- es-core/src/utils/CImgUtil.h | 3 ++- es-core/src/utils/MathUtil.h | 7 ++++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index 327bbef30..12a4b7047 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -23,11 +23,12 @@ #include "utils/StringUtil.h" #include "utils/TimeUtil.h" +#include "rapidjson/document.h" +#include "rapidjson/error/en.h" + #include <exception> #include <map> #include <pugixml.hpp> -#include <rapidjson/document.h> -#include <rapidjson/error/en.h> using namespace PlatformIds; using namespace rapidjson; diff --git a/es-app/src/scrapers/GamesDBJSONScraperResources.cpp b/es-app/src/scrapers/GamesDBJSONScraperResources.cpp index 64929712d..9001a2613 100644 --- a/es-app/src/scrapers/GamesDBJSONScraperResources.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraperResources.cpp @@ -21,11 +21,12 @@ #include "Log.h" #include "utils/FileSystemUtil.h" +#include "rapidjson/document.h" +#include "rapidjson/error/en.h" + #include <chrono> #include <fstream> #include <memory> -#include <rapidjson/document.h> -#include <rapidjson/error/en.h> #include <thread> using namespace rapidjson; diff --git a/es-core/src/resources/TextureData.cpp b/es-core/src/resources/TextureData.cpp index 924abd87f..70375c5b3 100644 --- a/es-core/src/resources/TextureData.cpp +++ b/es-core/src/resources/TextureData.cpp @@ -16,8 +16,9 @@ #include "renderers/Renderer.h" #include "resources/ResourceManager.h" -#include <nanosvg.h> -#include <nanosvgrast.h> +#include "nanosvg.h" +#include "nanosvgrast.h" + #include <string.h> #define DPI 96 diff --git a/es-core/src/utils/CImgUtil.h b/es-core/src/utils/CImgUtil.h index 66e177d1d..ee3dd39ef 100644 --- a/es-core/src/utils/CImgUtil.h +++ b/es-core/src/utils/CImgUtil.h @@ -12,7 +12,8 @@ // Disable the CImg display capabilities. #define cimg_display 0 -#include <CImg.h> +#include "CImg.h" + #include <vector> namespace Utils diff --git a/es-core/src/utils/MathUtil.h b/es-core/src/utils/MathUtil.h index 34fb84131..f89912321 100644 --- a/es-core/src/utils/MathUtil.h +++ b/es-core/src/utils/MathUtil.h @@ -10,9 +10,10 @@ #ifndef ES_CORE_UTILS_MATH_UTIL_H #define ES_CORE_UTILS_MATH_UTIL_H -#include <glm/ext/matrix_clip_space.hpp> -#include <glm/ext/matrix_transform.hpp> -#include <glm/trigonometric.hpp> +#include "glm/ext/matrix_clip_space.hpp" +#include "glm/ext/matrix_transform.hpp" +#include "glm/trigonometric.hpp" + #include <string> namespace Utils