X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/36e78d669c9c3765f7f3b020d3901fe0ddba2598..905c55de2bbe642412b47ed4e92344096c817fac:/client/Makefile

diff --git a/client/Makefile b/client/Makefile
index 616a2a74..3c7a33fd 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -7,7 +7,8 @@ include ../common/Makefile.common
 
 CC = gcc
 CXX = g++
-COMMON_FLAGS =  -std=c99 -O3 -mpopcnt -march=native -g
+COMMON_FLAGS += -std=c99 -O3 -mpopcnt -march=native -g
+
 #VPATH = ../common ../zlib
 OBJDIR = obj
 
@@ -19,7 +20,7 @@ LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform))) 
     LDLIBS +=  -L/mingw/lib -lgdi32
-	CFLAGS +=  -I/mingw/include
+	CFLAGS +=  -I/mingw/include -D__USE_MINGW_ANSI_STDIO=1
     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw
@@ -42,22 +43,31 @@ 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/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/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
@@ -72,12 +82,12 @@ else
     QTGUI = guidummy.o
 endif
 
-CORESRCS = 	uart.c \
-		util.c \
-		sleep.c
+CORESRCS =  uart.c \
+			util.c \
+			sleep.c
 
-
-CMDSRCS = 	nonce2key/crapto1.c \
+CMDSRCS =	mifarehost.c \
+			nonce2key/crapto1.c \
 			nonce2key/crypto1.c \
 			nonce2key/nonce2key.c \
 			nonce2key/crypto1_bs.c \
@@ -87,12 +97,13 @@ CMDSRCS = 	nonce2key/crapto1.c \
 			loclass/ikeys.c \
 			loclass/elite_crack.c \
 			loclass/fileutils.c \
-			mifarehost.c \
+			whereami.c \
 			parity.c \
 			crc.c \
 			crc16.c \
 			crc64.c \
 			iso14443crc.c \
+			legic_prng.c \
 			iso15693tools.c \
 			data.c \
 			graph.c \
@@ -112,6 +123,7 @@ CMDSRCS = 	nonce2key/crapto1.c \
 			cmdhfmfhard.c \
 			cmdhfmfdes.c \
 			cmdhftopaz.c \
+			cmdhfemv.c \
 			cmdhw.c \
 			cmdlf.c \
 			cmdlfio.c \
@@ -129,6 +141,11 @@ CMDSRCS = 	nonce2key/crapto1.c \
 			cmdlfpyramid.c \
 			cmdlfguard.c \
 			cmdlfnedap.c \
+			cmdlfjablotron.c \
+			cmdlfvisa2000.c \
+			cmdlfnoralsy.c \
+			cmdlffdx.c \
+			cmdlfcotag.c \
 			pm3_binlib.c \
 			scripting.c \
 			cmdscript.c \
@@ -147,8 +164,9 @@ CMDSRCS = 	nonce2key/crapto1.c \
 			reveng/getopt.c \
 			tea.c \
 			prng.c \
-			radixsort.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 
@@ -174,8 +192,9 @@ proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
 snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
+cli: LDLIBS+=$(LUALIB)
 cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
-	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
+	$(CXX) $(CXXFLAGS) -lpthread  $^ $(LDLIBS) -o $@
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@