diff options
| author | Thierry Lelegard <lelegard@users.noreply.github.com> | 2020-11-28 17:10:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-28 17:10:51 +0100 |
| commit | 66e550d11f1cb1fc5c13e8acf608cf753f1fb2fc (patch) | |
| tree | 88cd66d24668c2910044493e950ab57ce6833adb | |
| parent | 719f32fa7712ab411430377217aadce57f17f272 (diff) | |
| download | VeraCrypt-66e550d11f1cb1fc5c13e8acf608cf753f1fb2fc.tar.gz VeraCrypt-66e550d11f1cb1fc5c13e8acf608cf753f1fb2fc.zip | |
Fixed macFUSE support for macOS 11 (Big Sur) (#699)
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/Core/Unix/MacOSX/CoreMacOSX.cpp | 8 | ||||
| -rw-r--r-- | src/Main/Forms/MainFrame.h | 2 | ||||
| -rwxr-xr-x | src/Main/Main.make | 2 |
4 files changed, 11 insertions, 4 deletions
@@ -11,6 +11,9 @@ *.txt.h *.h.gch src/Main/veracrypt +*.oo +*.o.32 +*.o.64 # wxWidgets Linux build artifacts src/wxrelease diff --git a/src/Core/Unix/MacOSX/CoreMacOSX.cpp b/src/Core/Unix/MacOSX/CoreMacOSX.cpp index c3809ef3..b596e6e8 100644 --- a/src/Core/Unix/MacOSX/CoreMacOSX.cpp +++ b/src/Core/Unix/MacOSX/CoreMacOSX.cpp @@ -123,13 +123,17 @@ namespace VeraCrypt fuseVersionStringLength = MAXHOSTNAMELEN; if ((status = sysctlbyname ("vfs.generic.osxfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0) { - throw HigherFuseVersionRequired (SRC_POS); + fuseVersionStringLength = MAXHOSTNAMELEN; + if ((status = sysctlbyname ("vfs.generic.macfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0) + { + throw HigherFuseVersionRequired (SRC_POS); + } } } // look for OSXFuse dynamic library struct stat sb; - if (0 != stat("/usr/local/lib/libosxfuse_i64.2.dylib", &sb)) + if (0 != stat("/usr/local/lib/libosxfuse_i64.2.dylib", &sb) && 0 != stat("/usr/local/lib/libfuse.dylib", &sb)) { throw HigherFuseVersionRequired (SRC_POS); } diff --git a/src/Main/Forms/MainFrame.h b/src/Main/Forms/MainFrame.h index 9089ce72..44329459 100644 --- a/src/Main/Forms/MainFrame.h +++ b/src/Main/Forms/MainFrame.h @@ -170,7 +170,7 @@ namespace VeraCrypt void EnsureVisible(bool bOnlyHeadingBar = false) { - wxDisplay display (this); + wxDisplay display; wxRect displayRect = display.GetClientArea(); bool bMove = false; diff --git a/src/Main/Main.make b/src/Main/Main.make index 18efba64..19da94f9 100755 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -103,7 +103,7 @@ endif #------ FUSE configuration ------ ifeq "$(PLATFORM)" "MacOSX" -FUSE_LIBS = $(shell pkg-config osxfuse --libs) +FUSE_LIBS = $(shell pkg-config $(if $(patsubst 10.%,,$(VC_OSX_TARGET)),fuse,osxfuse) --libs) else FUSE_LIBS = $(shell pkg-config fuse --libs) endif |