VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--src/Core/Unix/MacOSX/CoreMacOSX.cpp8
-rw-r--r--src/Main/Forms/MainFrame.h2
-rwxr-xr-xsrc/Main/Main.make2
4 files changed, 11 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 9d22f88a..724f64ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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