X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/812513bf90423845e2e3f7d729b06421db3215a4..06d09c98eb9aff8fc1f258f60eb869728ebb92a8:/client/Makefile diff --git a/client/Makefile b/client/Makefile index f76c9556..68a8b188 100644 --- a/client/Makefile +++ b/client/Makefile @@ -41,16 +41,32 @@ ifneq (,$(findstring MINGW,$(platform))) endif else ifeq ($(platform),Darwin) - 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 - CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3 + + # 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 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) LUALIB += -ldl + LDLIBS += -ltermcap -lncurses MOC = $(shell pkg-config --variable=moc_location QtCore) # Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. #MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc @@ -70,7 +86,8 @@ CORESRCS = uart.c \ sleep.c -CMDSRCS = nonce2key/crapto1.c \ +CMDSRCS = mifarehost.c \ + nonce2key/crapto1.c \ nonce2key/crypto1.c \ nonce2key/nonce2key.c \ nonce2key/crypto1_bs.c \ @@ -80,18 +97,19 @@ CMDSRCS = nonce2key/crapto1.c \ loclass/ikeys.c \ loclass/elite_crack.c \ loclass/fileutils.c \ - mifarehost.c \ parity.c \ crc.c \ crc16.c \ crc64.c \ iso14443crc.c \ + legic_prng.c \ iso15693tools.c \ data.c \ graph.c \ ui.c \ cmddata.c \ lfdemod.c \ + cmdanalyse.c \ cmdhf.c \ cmdhf14a.c \ cmdhf14b.c \ @@ -121,6 +139,7 @@ CMDSRCS = nonce2key/crapto1.c \ cmdlfpyramid.c \ cmdlfguard.c \ cmdlfnedap.c \ + cmdlfjablotron.c \ pm3_binlib.c \ scripting.c \ cmdscript.c \ @@ -139,9 +158,9 @@ CMDSRCS = nonce2key/crapto1.c \ reveng/getopt.c \ tea.c \ prng.c \ - radixsort.c \ - bucketsort.c \ - cmdanalyse.c + bucketsort.c +# radixsort.c \ + ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED