summaryrefslogtreecommitdiff
path: root/src/resources/macos
diff options
context:
space:
mode:
authorSteph Enders <smenders@gmail.com>2022-06-26 21:57:43 -0400
committerSteph Enders <smenders@gmail.com>2022-06-26 21:57:43 -0400
commit734ee0f6352fdb6077c142d90f191c11c32f98d2 (patch)
tree4d4d40b7c9fcd4b900f45dfcdaf9d7c99e0d3ca8 /src/resources/macos
parent49f22d6f41d46635502d9e2e492ee36a1197a4de (diff)
Alias filesystem library to allow for xp usage
MacOS 10.14 still uses experimental/filesystem which is what we're currently targetting. If I can get my hands on a 10.15+ we can test that out
Diffstat (limited to 'src/resources/macos')
-rw-r--r--src/resources/macos/MacResources.cpp2
-rw-r--r--src/resources/macos/MacResources.h16
2 files changed, 10 insertions, 8 deletions
diff --git a/src/resources/macos/MacResources.cpp b/src/resources/macos/MacResources.cpp
index 90f43c8..2b41daa 100644
--- a/src/resources/macos/MacResources.cpp
+++ b/src/resources/macos/MacResources.cpp
@@ -26,7 +26,7 @@
//========================================================================
#include "MacResources.h"
-namespace std::filesystem = std::experimental::filesystem;
+namespace fs = std::experimental::filesystem;
MacResources::MacResources() : Resources() {
this->workingDir = std::filesystem::current_path();
diff --git a/src/resources/macos/MacResources.h b/src/resources/macos/MacResources.h
index 7af24b6..1d19575 100644
--- a/src/resources/macos/MacResources.h
+++ b/src/resources/macos/MacResources.h
@@ -28,20 +28,22 @@
#ifndef DNG_MACRESOURCES_H
#define DNG_MACRESOURCES_H
#include "../Resources.h"
-namespace std::filesystem = std::experimental::filesystem;
+
+namespace fs = std::experimental::filesystem;
+
class MacResources : public Resources {
public:
MacResources();
protected:
public:
- const char *convert_to_str(std::filesystem::path &path) override;
+ const char *convert_to_str(fs::path &path) override;
protected:
- std::filesystem::path exeDir;
- std::filesystem::path workingDir;
- std::vector<std::filesystem::path> levelSearchDirs() override;
- std::vector<std::filesystem::path> defaultsSearchDirs() override;
- std::vector<std::filesystem::path> fontSearchDirs() override;
+ fs::path exeDir;
+ fs::path workingDir;
+ std::vector<fs::path> levelSearchDirs() override;
+ std::vector<fs::path> defaultsSearchDirs() override;
+ std::vector<fs::path> fontSearchDirs() override;
};
#endif // DNG_MACRESOURCES_H