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/Main/Main.make | |
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/Main/Main.make')
-rwxr-xr-x | src/Main/Main.make | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Main/Main.make b/src/Main/Main.make index 9f907aef..a1c3519a 100755 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -102,7 +102,7 @@ endif #------ FUSE configuration ------ -FUSE_LIBS = $(shell $(PKG_CONFIG) fuse --libs) +FUSE_LIBS = $(shell $(PKG_CONFIG) $(VC_FUSE_PACKAGE) --libs) #------ Executable ------ @@ -223,7 +223,11 @@ ifdef VC_LEGACY_BUILD productsign --sign "Developer ID Installer: IDRIX (Z933746L2S)" --timestamp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt Legacy $(TC_VERSION).pkg" $(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg rm -f $(APPNAME)_Legacy_$(TC_VERSION).dmg else +ifeq "$(VC_OSX_FUSET)" "1" + /usr/local/bin/packagesbuild $(BASE_DIR)/Setup/MacOSX/veracrypt_fuse-t.pkgproj +else /usr/local/bin/packagesbuild $(BASE_DIR)/Setup/MacOSX/veracrypt.pkgproj +endif ifneq ("$(LOCAL_DEVELOPMENT_BUILD)","true") productsign --sign "Developer ID Installer: IDRIX (Z933746L2S)" --timestamp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt $(TC_VERSION).pkg" $(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg else |