diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-06-22 01:13:20 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-06-22 01:13:20 +0200 |
| commit | edde1d45f6de3e71b585b92e0e06d7499735c238 (patch) | |
| tree | a3caa522b1e21e1e337bea684fc1032d2e325e7a /src/Makefile | |
| parent | 8b01b533cfeafc989137c202af61c83f63c5f531 (diff) | |
| download | VeraCrypt-edde1d45f6de3e71b585b92e0e06d7499735c238.tar.gz VeraCrypt-edde1d45f6de3e71b585b92e0e06d7499735c238.zip | |
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.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 1747c637..d7f84148 100644 --- a/src/Makefile +++ b/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) |