X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/eb911aa8d6b2ddf5163fc75f06da416eb968bd9f..f1202c3fa9eb6473c3921ca56d399dee76699650:/client/Makefile?ds=inline

diff --git a/client/Makefile b/client/Makefile
index 3b5f34f5..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
@@ -54,11 +55,11 @@ else ifeq ($(platform),Darwin)
 	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
+		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/opt/local/lib -L/usr/local/opt/readline/lib -lreadline -lpthread -lm
+		LDLIBS = -L/usr/local/opt/readline/lib -lreadline -lpthread -lm
 	endif
 
     LUAPLATFORM = macosx
@@ -81,10 +82,9 @@ else
     QTGUI = guidummy.o
 endif
 
-CORESRCS = 	uart.c \
-		util.c \
-		sleep.c
-
+CORESRCS =  uart.c \
+			util.c \
+			sleep.c
 
 CMDSRCS =	mifarehost.c \
 			nonce2key/crapto1.c \
@@ -97,6 +97,7 @@ CMDSRCS =	mifarehost.c \
 			loclass/ikeys.c \
 			loclass/elite_crack.c \
 			loclass/fileutils.c \
+			whereami.c \
 			parity.c \
 			crc.c \
 			crc16.c \
@@ -122,6 +123,7 @@ CMDSRCS =	mifarehost.c \
 			cmdhfmfhard.c \
 			cmdhfmfdes.c \
 			cmdhftopaz.c \
+			cmdhfemv.c \
 			cmdhw.c \
 			cmdlf.c \
 			cmdlfio.c \
@@ -141,6 +143,9 @@ CMDSRCS =	mifarehost.c \
 			cmdlfnedap.c \
 			cmdlfjablotron.c \
 			cmdlfvisa2000.c \
+			cmdlfnoralsy.c \
+			cmdlffdx.c \
+			cmdlfcotag.c \
 			pm3_binlib.c \
 			scripting.c \
 			cmdscript.c \
@@ -187,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 $@