CHG: print up to 20 possible keys.

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 43e6860362c20e624f6726f78bb3ec03f2e11a1d..ca29f0f966fb0a9dae13a8501a55eb976a3e0280 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -16,25 +16,30 @@ LDLIBS =  -L/mingw/lib -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lm
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=c99 -I. -I../include -I../common -I/mingw/include -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 LUAPLATFORM = generic
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=c99 -I. -I../include -I../common -I/mingw/include -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 LUAPLATFORM = generic

+

 ifneq (,$(findstring MINGW,$(platform)))
 ifneq (,$(findstring MINGW,$(platform)))

-CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
-MOC = $(QTDIR)/bin/moc
-LUAPLATFORM = mingw
+    CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+    MOC = $(QTDIR)/bin/moc
+    LUAPLATFORM = mingw
+    ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
+        CXXFLAGS += -I$(QTDIR)/include/QtWidgets
+        QTLDLIBS = -L$(QTDIR)/lib -lQt5Core -lQt5Gui -lQt5Widgets
+    else
+        QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+    endif

 else ifeq ($(platform),Darwin)
 else ifeq ($(platform),Darwin)

-CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
-QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-MOC = $(shell pkg-config --variable=moc_location QtCore)
-LUAPLATFORM = macosx
+    CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
+    QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+    MOC = $(shell pkg-config --variable=moc_location QtCore)
+    LUAPLATFORM = macosx

 else
 else

-CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
-QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-MOC = $(shell pkg-config --variable=moc_location QtCore)
-LDLIBS +=  -ldl
-
-# 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
-LUAPLATFORM = linux
+    CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
+    QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+    MOC = $(shell pkg-config --variable=moc_location QtCore)
+    LDLIBS +=  -ldl
+    # 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
+    LUAPLATFORM = linux

 endif
 
 # QT version,  4 or 5
 endif
 
 # QT version,  4 or 5


@@ -48,11 +53,11 @@ else
 endif
 
 ifneq ($(QTLDLIBS),)
 endif
 
 ifneq ($(QTLDLIBS),)

-QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
-CFLAGS += -DHAVE_GUI
-LINK.o = $(LINK.cpp)
+    QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
+    CFLAGS += -DHAVE_GUI
+    LINK.o = $(LINK.cpp)

 else
 else

-QTGUI = guidummy.o
+    QTGUI = guidummy.o

 endif
 
 CORESRCS =     uart.c \
 endif
 
 CORESRCS =     uart.c \


@@ -70,7 +75,9 @@ CMDSRCS =     nonce2key/crapto1.c\
                loclass/elite_crack.c\
                loclass/fileutils.c\
                        mifarehost.c\
                loclass/elite_crack.c\
                loclass/fileutils.c\
                        mifarehost.c\

+                       crc.c \

                        crc16.c \
                        crc16.c \

+                       crc64.c \

                        iso14443crc.c \
                        iso15693tools.c \
                        data.c \
                        iso14443crc.c \
                        iso15693tools.c \
                        data.c \


@@ -87,6 +94,8 @@ CMDSRCS =     nonce2key/crapto1.c\
                        cmdhficlass.c \
                        cmdhfmf.c \
             cmdhfmfu.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
             cmdhfmfu.c \

+                       cmdhfmfdes.c \
+                       cmdhftopaz.c \

                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \


@@ -104,7 +113,12 @@ CMDSRCS =  nonce2key/crapto1.c\
                        pm3_bitlib.c\
                        aes.c\
                        protocols.c\
                        pm3_bitlib.c\
                        aes.c\
                        protocols.c\

-
+                       cmdcrc.c\
+                       # reveng/reveng.c\
+                       # reveng/cli.c\
+                       # reveng/bmpbit.c\
+                       # reveng/model.c\
+                       # reveng/poly.c\

 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)