X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e04475c42128e4b61c96cab0ff2c1a47d6413885..6cd2eef44ba915ffca378435429b3585e7d83797:/client/Makefile

diff --git a/client/Makefile b/client/Makefile
index 7f5ba2f3..ac7e6f98 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -15,11 +15,10 @@ OBJDIR = obj
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../tools -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
-    CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw
@@ -55,18 +54,18 @@ endif
 
 CORESRCS = 	uart.c \
 		util.c \
-		sleep.c
 
 
-CMDSRCS = 	nonce2key/crapto1.c\
-			nonce2key/crypto1.c\
-			nonce2key/nonce2key.c\
+CMDSRCS = 	crapto1/crapto1.c\
+			crapto1/crypto1.c\
+			nonce2key.c\
 			loclass/cipher.c \
 			loclass/cipherutils.c \
 			loclass/des.c \
 			loclass/ikeys.c \
 			loclass/elite_crack.c\
 			loclass/fileutils.c\
+			whereami.c\
 			mifarehost.c\
 			crc.c \
 			crc16.c \
@@ -90,23 +89,24 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			cmdhftopaz.c \
 			cmdhw.c \
 			cmdlf.c \
-			cmdlfio.c \
-			cmdlfhid.c \
 			cmdlfawid.c \
+			cmdlfcotag.c\
 			cmdlfem4x.c \
+			cmdlfhid.c \
 			cmdlfhitag.c \
-			cmdlfti.c \
-			cmdparser.c \
-			cmdmain.c \
-			cmdlft55xx.c \
+			cmdlfio.c \
 			cmdlfpcf7931.c\
-			cmdlfviking.c\
 			cmdlfpresco.c\
 			cmdlfpyramid.c\
-			cmdlfcotag.c\
-			pm3_binlib.c\
+			cmdlft55xx.c \
+			cmdlfti.c \
+			cmdlfviking.c\
+			cmdlfvisa2000.c\
+			cmdparser.c \
+			cmdmain.c \
 			scripting.c\
 			cmdscript.c\
+			pm3_binlib.c\
 			pm3_bitlib.c\
 			aes.c\
 			protocols.c\