Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Allow cross compilation. (#1182)

Browse Source
This commit is contained in:
Unit 193
2023-08-21 05:24:25 -04:00
committed by GitHub
parent fd0d2e3353
commit d49c75370a
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Driver/Fuse/Driver.make
View File

@@ -15,6 +15,6 @@ NAME := Driver
OBJS := OBJS :=
OBJS += FuseService.o OBJS += FuseService.o
CXXFLAGS += $(shell pkg-config fuse --cflags) CXXFLAGS += $(shell $(PKG_CONFIG) fuse --cflags)
include $(BUILD_INC)/Makefile.inc include $(BUILD_INC)/Makefile.inc

4
src/Main/Main.make
View File

@@ -102,7 +102,7 @@ endif
#------ FUSE configuration ------ #------ FUSE configuration ------
FUSE_LIBS = $(shell pkg-config fuse --libs) FUSE_LIBS = $(shell $(PKG_CONFIG) fuse --libs)
#------ Executable ------ #------ Executable ------
@@ -159,7 +159,7 @@ endif
$(APPNAME): $(LIBS) $(OBJS) $(APPNAME): $(LIBS) $(OBJS)
@echo Linking $@ @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" ifeq "$(TC_BUILD_CONFIG)" "Release"
ifndef NOSTRIP ifndef NOSTRIP

5
src/Makefile
View File

@@ -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 ASFLAGS := -D __GNUC__ -D __YASM__
export LFLAGS := export LFLAGS :=
export PKG_CONFIG ?= pkg-config
export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig
export WX_CONFIG ?= wx-config export WX_CONFIG ?= wx-config
@@ -101,8 +102,8 @@ ifeq "$(origin INDICATOR)" "command line"
else else
INDICATOR_LIBRARY=ayatana-appindicator-0.1 INDICATOR_LIBRARY=ayatana-appindicator-0.1
endif endif
export LIBS += $(shell pkg-config --libs $(INDICATOR_LIBRARY)) export AYATANA_LIBS += $(shell $(PKG_CONFIG) --libs $(INDICATOR_LIBRARY))
C_CXX_FLAGS += $(shell pkg-config --cflags $(INDICATOR_LIBRARY)) -DHAVE_INDICATORS C_CXX_FLAGS += $(shell $(PKG_CONFIG) --cflags $(INDICATOR_LIBRARY)) -DHAVE_INDICATORS
endif endif
#------ Release configuration ------ #------ Release configuration ------