Remove local armsrc/stdint.h and fix some other #includes

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index cab4fddbb229d4852a43768ea5e985f655229a1c..7c2a7a71d412d87311eac1b524042cca9b526926 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,13 +12,14 @@ CXX=g++
 VPATH = ../common ../zlib
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -ltermcap -lncurses
+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
 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
@@ -37,6 +38,7 @@ else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
     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
@@ -65,6 +67,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\
+                       whereami.c\
                        mifarehost.c\
                        crc.c \
                        crc16.c \
@@ -84,7 +87,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
-            cmdhfmfu.c \
+                       cmdhfmfu.c \
                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \
@@ -101,6 +104,7 @@ CMDSRCS =   nonce2key/crapto1.c\
                        cmdlfviking.c\
                        cmdlfpresco.c\
                        cmdlfpyramid.c\
+                       cmdlfcotag.c\
                        pm3_binlib.c\
                        scripting.c\
                        cmdscript.c\
@@ -108,6 +112,13 @@ CMDSRCS =  nonce2key/crapto1.c\
                        aes.c\
                        protocols.c\
                        sha1.c\
+                       cmdcrc.c\
+                       reveng/reveng.c\
+                       reveng/cli.c\
+                       reveng/bmpbit.c\
+                       reveng/model.c\
+                       reveng/poly.c\
+                       reveng/getopt.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