Fix mac compilation

codereader · Dec 26, 2020 · c98020c · c98020c
1 parent eac6cd2
commit c98020c
Show file tree

Hide file tree

Showing 4 changed files with 172 additions and 72 deletions.
diff --git a/libs/module/ApplicationContextBase.cpp b/libs/module/ApplicationContextBase.cpp
@@ -92,7 +92,9 @@ std::string ApplicationContextBase::getRuntimeDataPath() const
 
 std::string ApplicationContextBase::getHTMLPath() const
 {
-#if defined(POSIX)
+#if defined(__APPLE__)
+    return getRuntimeDataPath();
+#elif defined(POSIX)
 #if defined(ENABLE_RELOCATION)
     return _appPath + "../share/doc/darkradiant/";
 #elif defined(HTMLDIR)
@@ -101,7 +103,7 @@ std::string ApplicationContextBase::getHTMLPath() const
 #error "Either HTMLDIR or ENABLE_RELOCATION must be defined"
 #endif
 #else
-    // TODO: implement correct path for macOS and Windows
+    // TODO: implement correct path for Windows
     return getRuntimeDataPath();
 #endif
 }

diff --git a/libs/os/fs.h b/libs/os/fs.h
@@ -41,6 +41,9 @@ namespace fs = std::experimental::filesystem::v1;
 
 namespace fs = boost::filesystem;
 
+// add a time type alias to be compatible with std::filesystem
+namespace boost { namespace filesystem { typedef std::size_t file_time_type; } }
+
 #endif
 
 #include "string/predicate.h"