diff options
| author | Unit 193 <32967979+Unit193@users.noreply.github.com> | 2023-08-21 05:24:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-21 11:24:25 +0200 |
| commit | d49c75370ae6ffcec4b3d11cd959fe7d251ef67c (patch) | |
| tree | 87400080db5b30f47efcea4f79c90305a1a1ccf0 | |
| parent | fd0d2e3353ede2ca1acaf0eca30822dc44995e0d (diff) | |
| download | VeraCrypt-d49c75370ae6ffcec4b3d11cd959fe7d251ef67c.tar.gz VeraCrypt-d49c75370ae6ffcec4b3d11cd959fe7d251ef67c.zip | |
Allow cross compilation. (#1182)
| -rw-r--r-- | src/Driver/Fuse/Driver.make | 2 | ||||
| -rwxr-xr-x | src/Main/Main.make | 4 | ||||
| -rw-r--r-- | src/Makefile | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/Driver/Fuse/Driver.make b/src/Driver/Fuse/Driver.make index f58785b9..b3640115 100644 --- a/src/Driver/Fuse/Driver.make +++ b/src/Driver/Fuse/Driver.make @@ -15,6 +15,6 @@ NAME := Driver OBJS := OBJS += FuseService.o -CXXFLAGS += $(shell pkg-config fuse --cflags) +CXXFLAGS += $(shell $(PKG_CONFIG) fuse --cflags) include $(BUILD_INC)/Makefile.inc diff --git a/src/Main/Main.make b/src/Main/Main.make index 84f9d755..90b8b126 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) fuse --libs) #------ Executable ------ @@ -159,7 +159,7 @@ endif $(APPNAME): $(LIBS) $(OBJS) @echo Linking $@ - $(CXX) -o $(APPNAME) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS) $(LFLAGS) + $(CXX) -o $(APPNAME) $(OBJS) $(LIBS) $(AYATANA_LIBS) $(FUSE_LIBS) $(WX_LIBS) $(LFLAGS) ifeq "$(TC_BUILD_CONFIG)" "Release" ifndef NOSTRIP diff --git a/src/Makefile b/src/Makefile index f6ec5041..356f0a7b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -49,6 +49,7 @@ C_CXX_FLAGS := -MMD -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES -I export ASFLAGS := -D __GNUC__ -D __YASM__ export LFLAGS := +export PKG_CONFIG ?= pkg-config export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig export WX_CONFIG ?= wx-config @@ -101,8 +102,8 @@ ifeq "$(origin INDICATOR)" "command line" else INDICATOR_LIBRARY=ayatana-appindicator-0.1 endif - export LIBS += $(shell pkg-config --libs $(INDICATOR_LIBRARY)) - C_CXX_FLAGS += $(shell pkg-config --cflags $(INDICATOR_LIBRARY)) -DHAVE_INDICATORS + export AYATANA_LIBS += $(shell $(PKG_CONFIG) --libs $(INDICATOR_LIBRARY)) + C_CXX_FLAGS += $(shell $(PKG_CONFIG) --cflags $(INDICATOR_LIBRARY)) -DHAVE_INDICATORS endif #------ Release configuration ------ |