RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-12-27 10:34:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

ADD: since the client now calls legic prng, this is needed here too.

Browse source 
CHG:  the OS X  QT4 vs QT5 detection.  NOT fixed yet.
This commit is contained in:
iceman1001 2016-09-09 11:58:53 +02:00
parent 5d15891e2b
commit f72669f366
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
client/Makefile
View file

@ -42,17 +42,25 @@ ifneq (,$(findstring MINGW,$(platform)))
else ifeq ($(platform),Darwin)
# Assuming you have QT4 installed.
CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include
LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -lreadline -lpthread -lm
# use this if you have QT5 installed.
#CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include -I/usr/local/opt/qt5/include
#LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -lreadline -lpthread -lm
# OS X, QT5 detection needs this.
export PKG_CONFIG_PATH=/usr/local/Cellar/qt5/5.6.1-1/lib/pkgconfig/
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
MOC = $(shell pkg-config --variable=moc_location QtCore)
# QT version, 4 or 5
qtplatform = $(shell $(MOC) -v)
ifneq (, $(findstring moc 5,$(qtplatform)))
# use this if you have QT5 installed.
CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include -I/usr/local/opt/qt5/include
LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -lreadline -lpthread -lm
else
# Assuming you have QT4 installed.
CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include
LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -lreadline -lpthread -lm
endif
LUAPLATFORM = macosx
else
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
@ -94,6 +102,7 @@ CMDSRCS = mifarehost.c \
crc16.c \
crc64.c \
iso14443crc.c \
legic_prng.c \
iso15693tools.c \
data.c \
graph.c \