Fixed macFUSE support for macOS 11 (Big Sur) (#699)
This commit is contained in:
parent
719f32fa77
commit
66e550d11f
|
@ -11,6 +11,9 @@
|
||||||
*.txt.h
|
*.txt.h
|
||||||
*.h.gch
|
*.h.gch
|
||||||
src/Main/veracrypt
|
src/Main/veracrypt
|
||||||
|
*.oo
|
||||||
|
*.o.32
|
||||||
|
*.o.64
|
||||||
|
|
||||||
# wxWidgets Linux build artifacts
|
# wxWidgets Linux build artifacts
|
||||||
src/wxrelease
|
src/wxrelease
|
||||||
|
|
|
@ -122,14 +122,18 @@ namespace VeraCrypt
|
||||||
{
|
{
|
||||||
fuseVersionStringLength = MAXHOSTNAMELEN;
|
fuseVersionStringLength = MAXHOSTNAMELEN;
|
||||||
if ((status = sysctlbyname ("vfs.generic.osxfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0)
|
if ((status = sysctlbyname ("vfs.generic.osxfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0)
|
||||||
|
{
|
||||||
|
fuseVersionStringLength = MAXHOSTNAMELEN;
|
||||||
|
if ((status = sysctlbyname ("vfs.generic.macfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0)
|
||||||
{
|
{
|
||||||
throw HigherFuseVersionRequired (SRC_POS);
|
throw HigherFuseVersionRequired (SRC_POS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// look for OSXFuse dynamic library
|
// look for OSXFuse dynamic library
|
||||||
struct stat sb;
|
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);
|
throw HigherFuseVersionRequired (SRC_POS);
|
||||||
}
|
}
|
||||||
|
|
|
@ -170,7 +170,7 @@ namespace VeraCrypt
|
||||||
|
|
||||||
void EnsureVisible(bool bOnlyHeadingBar = false)
|
void EnsureVisible(bool bOnlyHeadingBar = false)
|
||||||
{
|
{
|
||||||
wxDisplay display (this);
|
wxDisplay display;
|
||||||
wxRect displayRect = display.GetClientArea();
|
wxRect displayRect = display.GetClientArea();
|
||||||
|
|
||||||
bool bMove = false;
|
bool bMove = false;
|
||||||
|
|
|
@ -103,7 +103,7 @@ endif
|
||||||
#------ FUSE configuration ------
|
#------ FUSE configuration ------
|
||||||
|
|
||||||
ifeq "$(PLATFORM)" "MacOSX"
|
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
|
else
|
||||||
FUSE_LIBS = $(shell pkg-config fuse --libs)
|
FUSE_LIBS = $(shell pkg-config fuse --libs)
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue