mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-11 11:08:02 -06:00
MacOSX: Add for using FUSE-T instead of MacFUSE
The build script build_veracrypt_macosx.h now accepts the argument -f to enable fuse-t support. It is also possible to set the environment variable VC_OSX_FUSET to 1 for FUSE-T support. A change was done in CoreUnix::GetMountedVolumes to add a waiting loop for control file to be accessible because when using FUSE-T there always a delay before control file can be serialized.
This commit is contained in:
15
src/Makefile
15
src/Makefile
@@ -24,7 +24,8 @@
|
||||
# SSE41: Enable SSE4.1 support in compiler
|
||||
# NOSSE2: Disable SEE2 support in compiler
|
||||
# WITHGTK3: Build wxWidgets against GTK3
|
||||
# WOLFCRYPT: Build with wolfCrypt as crypto provider (see Crypto/wolfCrypt.md)
|
||||
# WOLFCRYPT: Build with wolfCrypt as crypto provider (see Crypto/wolfCrypt.md)
|
||||
# WITHFUSET: Build with FUSE-T support on macOS instead of MacFUSE
|
||||
|
||||
#------ Targets ------
|
||||
# all
|
||||
@@ -52,6 +53,8 @@ export LFLAGS :=
|
||||
|
||||
export PKG_CONFIG ?= pkg-config
|
||||
export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig
|
||||
export VC_FUSE_PACKAGE := fuse
|
||||
export VC_OSX_FUSET ?= 0
|
||||
|
||||
export WX_CONFIG ?= wx-config
|
||||
export WX_CONFIG_ARGS := --unicode
|
||||
@@ -62,6 +65,12 @@ WX_ROOT ?= $(BASE_DIR)/wxWidgets
|
||||
|
||||
export TC_BUILD_CONFIG := Release
|
||||
|
||||
ifeq "$(origin WITHFUSET)" "command line"
|
||||
ifneq "$(WITHFUSET)" "0"
|
||||
VC_OSX_FUSET := 1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq "$(origin DEBUG)" "command line"
|
||||
ifneq "$(DEBUG)" "0"
|
||||
TC_BUILD_CONFIG := Debug
|
||||
@@ -333,6 +342,10 @@ ifeq "$(shell uname -s)" "Darwin"
|
||||
|
||||
WX_CONFIGURE_FLAGS += --with-macosx-version-min=$(VC_OSX_TARGET) --with-macosx-sdk=$(VC_OSX_SDK_PATH)
|
||||
|
||||
ifneq "$(VC_OSX_FUSET)" "0"
|
||||
C_CXX_FLAGS += -DVC_MACOSX_FUSET
|
||||
VC_FUSE_PACKAGE := fuse-t
|
||||
endif
|
||||
|
||||
# Set x86 assembly flags (-msse2, -mssse3, -msse4.1)
|
||||
# Apply flags if SIMD_SUPPORTED is 1 or if not in local development build (we are creating universal binary in this case)
|
||||
|
||||
Reference in New Issue
Block a user