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!

2 files changed, 15 insertions, 19 deletions

diff --git a/src/resources/macos/MacResources.cpp b/src/resources/macos/MacResources.cpp
index 2b41daa..9ae3499 100644
--- a/src/resources/macos/MacResources.cpp
+++ b/src/resources/macos/MacResources.cpp
@@ -26,28 +26,26 @@
 //========================================================================
 
 #include "MacResources.h"
-namespace fs = std::experimental::filesystem;
 
 MacResources::MacResources() : Resources() {
-  this->workingDir = std::filesystem::current_path();
-  this->exeDir = std::filesystem::canonical("/proc/self/exe").remove_filename();
+  this->workingDir = filesystem::current_path();
+  this->exeDir = filesystem::canonical("/proc/self/exe").remove_filename();
   // set an initial value - will get hardset in load if found
-  std::filesystem::path f =
-      workingDir / "res" / DEFAULT_FONT; // default as fallback
-  this->font = std::make_shared<std::filesystem::path>(f);
-  this->defaultsLua = std::make_shared<std::filesystem::path>();
+  filesystem::path f = workingDir / "res" / DEFAULT_FONT; // default as fallback
+  this->font = std::make_shared<filesystem::path>(f);
+  this->defaultsLua = std::make_shared<filesystem::path>();
 }
 
-std::vector<std::filesystem::path> MacResources::levelSearchDirs() {
+std::vector<filesystem::path> MacResources::levelSearchDirs() {
   return {workingDir / "maps", exeDir / "maps"};
 }
-std::vector<std::filesystem::path> MacResources::defaultsSearchDirs() {
+std::vector<filesystem::path> MacResources::defaultsSearchDirs() {
   return {workingDir / "dnglib", exeDir / "dnglib"};
 }
-std::vector<std::filesystem::path> MacResources::fontSearchDirs() {
+std::vector<filesystem::path> MacResources::fontSearchDirs() {
   return {workingDir / "res", exeDir / "res"};
 }
 
-const char *MacResources::convert_to_str(std::filesystem::path &path) {
+const char *MacResources::convert_to_str(filesystem::path &path) {
   return path.c_str();
 }
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<fs::path> levelSearchDirs() override;
-  std::vector<fs::path> defaultsSearchDirs() override;
-  std::vector<fs::path> fontSearchDirs() override;
+  filesystem::path exeDir;
+  filesystem::path workingDir;
+  std::vector<filesystem::path> levelSearchDirs() override;
+  std::vector<filesystem::path> defaultsSearchDirs() override;
+  std::vector<filesystem::path> fontSearchDirs() override;
 };
 #endif // DNG_MACRESOURCES_H