Merge pull request #419 from andreasb242/master

Mac Build
7 years ago · a5b945f6dd
parent da07bbe0f2 4b2318afd3
commit a5b945f6dd
2 changed files with 8 additions and 0 deletions
--- a/src/control/XournalMain.cpp
+++ b/src/control/XournalMain.cpp
@ -19,7 +19,11 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/locale.hpp>
+
+#ifdef __APPLE__
 #undef ENABLE_NLS
+#endif
+
 namespace bf = boost::filesystem;

 #include <string>
--- a/src/xoj-preview-extractor/xournal-thumbnailer.cpp
+++ b/src/xoj-preview-extractor/xournal-thumbnailer.cpp
@ -19,7 +19,11 @@
 #include <XojPreviewExtractor.h>

 namespace bl = boost::locale;
+
+#ifdef __APPLE__
 #undef ENABLE_NLS
+#endif
+
 #include <iostream>
 #include <fstream>
 using std::cerr;