minor fix when reading blocks

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 7224fe069fc23ca36fc466590a7884d1471e5f7e..364070e8364b4fc0b45913cb6e75153493e93276 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -19,7 +19,12 @@ CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4

-MOC = moc
+MOC = $(QTDIR)/moc
+####################################################
+# Disabled gui for Windows, can someone with more
+# knowledge about QT fix this problem??
+####################################################
+QTLDLIBS=

 else ifeq ($(platform),Darwin)
 CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
 QTLDLIBS = -framework QtGui -framework QtCore
 else ifeq ($(platform),Darwin)
 CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
 QTLDLIBS = -framework QtGui -framework QtCore


@@ -31,13 +36,13 @@ MOC = $(shell pkg-config --variable=moc_location QtCore)
 endif
 
 
 endif
 
 

-#ifneq ($(QTLDLIBS),)
-#QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
-#CFLAGS += -DHAVE_GUI
-#LINK.o = $(LINK.cpp)
-#else
+ifneq ($(QTLDLIBS),)
+QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
+CFLAGS += -DHAVE_GUI
+LINK.o = $(LINK.cpp)
+else

 QTGUI = guidummy.o
 QTGUI = guidummy.o

-#endif
+endif

 
 CMDSRCS = \
                        nonce2key/crapto1.c\
 
 CMDSRCS = \
                        nonce2key/crapto1.c\


@@ -56,6 +61,7 @@ CMDSRCS = \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf15.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf15.c \

+                       cmdhfepa.c \

                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \


@@ -63,14 +69,16 @@ CMDSRCS = \
                        cmdlf.c \
                        cmdlfem4x.c \
                        cmdlfhid.c \
                        cmdlf.c \
                        cmdlfem4x.c \
                        cmdlfhid.c \

+                       cmdlfhitag.c \

                        cmdlfti.c \
                        cmdparser.c \
                        cmdlfti.c \
                        cmdparser.c \

-                       cmdmain.c
+                       cmdmain.c \
+                       uart.c

 
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 RM = rm -f
 
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 RM = rm -f

-BINS = proxmark3 snooper cli flasher
+BINS = proxmark3 flasher #snooper cli

 CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
 all: $(BINS)
 CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
 all: $(BINS)