From 38d46b2dda0243cfa60bc6945859ebd587e0a851 Mon Sep 17 00:00:00 2001 From: Steph Enders Date: Mon, 27 Jun 2022 17:45:44 -0400 Subject: Update MacOS to compile w/ Boost MacOS seems to rely on an older/different C++ stdlib than Windows or Linux. So replacing those with Boost equivalents. Mostly contained to the Resources thankfully! --- src/resources/macos/MacResources.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/resources/macos/MacResources.h') diff --git a/src/resources/macos/MacResources.h b/src/resources/macos/MacResources.h index 1d19575..4cb66cd 100644 --- a/src/resources/macos/MacResources.h +++ b/src/resources/macos/MacResources.h @@ -29,21 +29,19 @@ #define DNG_MACRESOURCES_H #include "../Resources.h" -namespace fs = std::experimental::filesystem; - class MacResources : public Resources { public: MacResources(); protected: public: - const char *convert_to_str(fs::path &path) override; + const char *convert_to_str(filesystem::path &path) override; protected: - fs::path exeDir; - fs::path workingDir; - std::vector levelSearchDirs() override; - std::vector defaultsSearchDirs() override; - std::vector fontSearchDirs() override; + filesystem::path exeDir; + filesystem::path workingDir; + std::vector levelSearchDirs() override; + std::vector defaultsSearchDirs() override; + std::vector fontSearchDirs() override; }; #endif // DNG_MACRESOURCES_H -- cgit v1.2.3-54-g00ecf