X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2813c42f98c0b40251c4a6c0289720c9a60db485..2de9622f0e8244c06acbce41fc5501ba7304e85b:/client/Makefile diff --git a/client/Makefile b/client/Makefile index 4f90463f..616a2a74 100644 --- a/client/Makefile +++ b/client/Makefile @@ -41,8 +41,16 @@ ifneq (,$(findstring MINGW,$(platform))) endif else ifeq ($(platform),Darwin) - LDLIBS = -L/opt/local/lib -lreadline -lpthread -lm - CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3 + + # 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 + + 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) LUAPLATFORM = macosx @@ -91,6 +99,7 @@ CMDSRCS = nonce2key/crapto1.c \ ui.c \ cmddata.c \ lfdemod.c \ + cmdanalyse.c \ cmdhf.c \ cmdhf14a.c \ cmdhf14b.c \ @@ -119,6 +128,7 @@ CMDSRCS = nonce2key/crapto1.c \ cmdlfpresco.c \ cmdlfpyramid.c \ cmdlfguard.c \ + cmdlfnedap.c \ pm3_binlib.c \ scripting.c \ cmdscript.c \ @@ -139,6 +149,7 @@ CMDSRCS = nonce2key/crapto1.c \ prng.c \ radixsort.c \ bucketsort.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 #-DDEBUG -Dverbose=1