some minor tweaks to help OSX build thanks to Alexandre Feblot!

eteran · Feb 10, 2018 · 27e11d4 · 27e11d4
1 parent a91ea0a
commit 27e11d4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Util/include/Util/string_view.h b/Util/include/Util/string_view.h
@@ -557,6 +557,14 @@ struct hash_constants<uint32_t>{
     static constexpr uint32_t FNV_prime        = 16777619;
 };
 
+#ifdef Q_OS_MACOS
+template <>
+struct hash_constants<unsigned long>{
+    static constexpr uint32_t FNV_offset_basis = 0x811c9dc5;
+    static constexpr uint32_t FNV_prime        = 16777619;
+};
+#endif
+
 }
 
 namespace std {

diff --git a/import/CMakeLists.txt b/import/CMakeLists.txt
@@ -9,6 +9,8 @@ find_package(Qt5 5.4.0 REQUIRED Core Xml)
 find_package(X11 REQUIRED)
 find_package(Boost 1.35 REQUIRED)
 
+link_directories(${X11_LIBRARY_DIR})
+
 add_executable(nedit-import
 	import.cpp
 )