From 66e550d11f1cb1fc5c13e8acf608cf753f1fb2fc Mon Sep 17 00:00:00 2001 From: Thierry Lelegard Date: Sat, 28 Nov 2020 17:10:51 +0100 Subject: Fixed macFUSE support for macOS 11 (Big Sur) (#699) --- src/Main/Forms/MainFrame.h | 2 +- src/Main/Main.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Main') 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 -- cgit v1.2.3