RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-27 01:25:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

Makefile: dissociate Darwin and Brew

Browse source
This commit is contained in:
Philippe Teuwen 2021-05-23 02:14:20 +02:00
parent 701f618f97
commit 4b80125f42
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.defs
View file

@ -50,6 +50,7 @@ else
endif endif
ifeq ($(platform),Darwin) ifeq ($(platform),Darwin)
USE_BREW = 1
AR= /usr/bin/ar rcs AR= /usr/bin/ar rcs
RANLIB= /usr/bin/ranlib RANLIB= /usr/bin/ranlib
else else
@ -57,8 +58,7 @@ else
RANLIB= ranlib RANLIB= ranlib
endif endif
# For detection of Apple Silicon ifeq ($(USE_BREW),1)
ifeq ($(platform),Darwin)
BREW_PREFIX = $(shell brew --prefix) BREW_PREFIX = $(shell brew --prefix)
endif endif

10
client/Makefile
View file

@ -13,7 +13,9 @@ VPATH = ../common src
vpath %.dic dictionaries vpath %.dic dictionaries
OBJDIR = obj OBJDIR = obj
ifeq ($(platform),Darwin) ifeq ($(USE_BREW),1)
INCLUDES += -I$(BREW_PREFIX)/include
LDLIBS += -L$(BREW_PREFIX)/lib
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt/lib/pkgconfig PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt/lib/pkgconfig
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt5/lib/pkgconfig PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt5/lib/pkgconfig
endif endif
@ -276,9 +278,9 @@ CXXINCLUDES += $(QTINCLUDES)
## Readline ## Readline
ifneq ($(SKIPREADLINE),1) ifneq ($(SKIPREADLINE),1)
ifeq ($(platform),Darwin) ifeq ($(USE_BREW),1)
LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib
INCLUDES += -I$(BREW_PREFIX)/opt/readline/include INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
endif endif
LDLIBS += -lreadline LDLIBS += -lreadline
READLINE_FOUND = 1 READLINE_FOUND = 1