rfidrig/proxmark3
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-12 11:18:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: dissociate Darwin and Brew

Browse Source
This commit is contained in:
Philippe Teuwen
2021-05-23 02:42:26 +02:00
parent 701f618f97
commit 4b80125f42
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.defs
+2 -2
View File
@@ -50,6 +50,7 @@ else
endif
ifeq ($(platform),Darwin)
USE_BREW = 1
AR= /usr/bin/ar rcs
RANLIB= /usr/bin/ranlib
else
@@ -57,8 +58,7 @@ else
RANLIB= ranlib
endif
# For detection of Apple Silicon
ifeq ($(platform),Darwin)
ifeq ($(USE_BREW),1)
BREW_PREFIX = $(shell brew --prefix)
endif
client/Makefile
+6 -4
View File
@@ -13,7 +13,9 @@ VPATH = ../common src
vpath %.dic dictionaries
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/qt5/lib/pkgconfig
endif
@@ -276,9 +278,9 @@ CXXINCLUDES += $(QTINCLUDES)
## Readline
ifneq ($(SKIPREADLINE),1)
ifeq ($(platform),Darwin)
LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib
INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
ifeq ($(USE_BREW),1)
LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib
INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
endif
LDLIBS += -lreadline
READLINE_FOUND = 1