|
3 | 3 | Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528 |
4 | 4 |
|
5 | 5 | --- |
6 | | - src/Driver/Fuse/Driver.make | 2 +- |
7 | 6 | src/Driver/Fuse/FuseService.cpp | 26 +++++++++----------------- |
8 | | - src/Main/Main.make | 2 +- |
9 | | - 3 files changed, 11 insertions(+), 19 deletions(-) |
| 7 | + src/Makefile | 2 +- |
| 8 | + 2 files changed, 10 insertions(+), 18 deletions(-) |
10 | 9 |
|
11 | | ---- a/src/Main/Main.make |
12 | | -+++ b/src/Main/Main.make |
13 | | -@@ -102,7 +102,7 @@ endif |
| 10 | +--- a/src/Makefile |
| 11 | ++++ b/src/Makefile |
| 12 | +@@ -52,7 +52,7 @@ export LFLAGS := |
14 | 13 |
|
15 | | - #------ FUSE configuration ------ |
| 14 | + export PKG_CONFIG ?= pkg-config |
| 15 | + export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig |
| 16 | +-export VC_FUSE_PACKAGE := fuse |
| 17 | ++export VC_FUSE_PACKAGE := fuse3 |
| 18 | + export VC_OSX_FUSET ?= 0 |
16 | 19 |
|
17 | | --FUSE_LIBS = $(shell $(PKG_CONFIG) fuse --libs) |
18 | | -+FUSE_LIBS = $(shell $(PKG_CONFIG) fuse3 --libs) |
19 | | - |
20 | | - #------ Executable ------ |
21 | | - |
22 | | ---- a/src/Driver/Fuse/Driver.make |
23 | | -+++ b/src/Driver/Fuse/Driver.make |
24 | | -@@ -15,6 +15,6 @@ NAME := Driver |
25 | | - OBJS := |
26 | | - OBJS += FuseService.o |
27 | | - |
28 | | --CXXFLAGS += $(shell $(PKG_CONFIG) fuse --cflags) |
29 | | -+CXXFLAGS += $(shell $(PKG_CONFIG) fuse3 --cflags) |
30 | | - |
31 | | - include $(BUILD_INC)/Makefile.inc |
| 20 | + export WX_CONFIG ?= wx-config |
32 | 21 | --- a/src/Driver/Fuse/FuseService.cpp |
33 | 22 | +++ b/src/Driver/Fuse/FuseService.cpp |
34 | 23 | @@ -13,7 +13,7 @@ |
|
0 commit comments