CHG: according to measureement by @wilrn the actual timing for receiving tag data...

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 7b9a65fdf4defad29e478722b49d05343030315f..68a8b1889031c084267bb72e18abdeab93c82074 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -42,17 +42,25 @@ ifneq (,$(findstring MINGW,$(platform)))
        
 else ifeq ($(platform),Darwin)
 
        
 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)
 
        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
     LUAPLATFORM = macosx
 else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3


@@ -78,7 +86,8 @@ CORESRCS =    uart.c \
                sleep.c
 
 
                sleep.c
 
 

-CMDSRCS =      nonce2key/crapto1.c \
+CMDSRCS =      mifarehost.c \
+                       nonce2key/crapto1.c \

                        nonce2key/crypto1.c \
                        nonce2key/nonce2key.c \
                        nonce2key/crypto1_bs.c \
                        nonce2key/crypto1.c \
                        nonce2key/nonce2key.c \
                        nonce2key/crypto1_bs.c \


@@ -88,12 +97,12 @@ CMDSRCS =   nonce2key/crapto1.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c \
                        loclass/fileutils.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c \
                        loclass/fileutils.c \

-                       mifarehost.c \

                        parity.c \
                        crc.c \
                        crc16.c \
                        crc64.c \
                        iso14443crc.c \
                        parity.c \
                        crc.c \
                        crc16.c \
                        crc64.c \
                        iso14443crc.c \

+                       legic_prng.c \

                        iso15693tools.c \
                        data.c \
                        graph.c \
                        iso15693tools.c \
                        data.c \
                        graph.c \


@@ -130,6 +139,7 @@ CMDSRCS =   nonce2key/crapto1.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \
                        cmdlfnedap.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \
                        cmdlfnedap.c \

+                       cmdlfjablotron.c \

                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \
                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \


@@ -148,8 +158,9 @@ CMDSRCS =   nonce2key/crapto1.c \
                        reveng/getopt.c \
                        tea.c \
                        prng.c \
                        reveng/getopt.c \
                        tea.c \
                        prng.c \

-                       radixsort.c \

                        bucketsort.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 
                
 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