diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-09-29 15:41:19 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-10-17 18:40:21 +0200 |
| commit | 7d6347f468050309d8b85089c13dd6d008297801 (patch) | |
| tree | 1b723c1396258dfae3ab7bcb1e9f87141e739b79 /src/Main | |
| parent | e362d804b0a9e92b36f3e2d28d08bbbc387ac9a2 (diff) | |
| download | VeraCrypt-7d6347f468050309d8b85089c13dd6d008297801.tar.gz VeraCrypt-7d6347f468050309d8b85089c13dd6d008297801.zip | |
MacOSX: remove MacFUSE dependency and link against OSXFuse library. Now, only standard OSXFuse install is needed without MacFUSE compatibility option.
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/Main.make | 5 | ||||
| -rw-r--r-- | src/Main/UserInterface.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/Main/Main.make b/src/Main/Main.make index f4f254e1..8f223517 100644 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -106,8 +106,11 @@ endif #------ FUSE configuration ------ +ifeq "$(PLATFORM)" "MacOSX" +FUSE_LIBS = $(shell pkg-config osxfuse --libs) +else FUSE_LIBS = $(shell pkg-config fuse --libs) - ++endif #------ Executable ------ diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp index 8d4b701a..978a0375 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -493,7 +493,7 @@ namespace VeraCrypt EX2MSG (UnsupportedTrueCryptFormat, LangString["UNSUPPORTED_TRUECRYPT_FORMAT"]); #ifdef TC_MACOSX - EX2MSG (HigherFuseVersionRequired, _("VeraCrypt requires OSXFUSE 2.3 or later with MacFUSE compatibility layer installer.\nPlease ensure that you have selected this compatibility layer during OSXFUSE installation.")); + EX2MSG (HigherFuseVersionRequired, _("VeraCrypt requires OSXFUSE 2.5 or above.")); #endif #undef EX2MSG |