X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/38c4979dae8b7a215d356ceaa5a386ccbb126e38..e98300f2455f72b64df737b3a81c072b6b3761e3:/client/Makefile diff --git a/client/Makefile b/client/Makefile index 7224fe06..597f562e 100644 --- a/client/Makefile +++ b/client/Makefile @@ -19,7 +19,7 @@ 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 -MOC = moc +MOC = $(QTDIR)/bin/moc 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 +31,13 @@ MOC = $(shell pkg-config --variable=moc_location QtCore) 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 -#endif +endif CMDSRCS = \ nonce2key/crapto1.c\ @@ -56,6 +56,7 @@ CMDSRCS = \ cmdhf14a.c \ cmdhf14b.c \ cmdhf15.c \ + cmdhfepa.c \ cmdhflegic.c \ cmdhficlass.c \ cmdhfmf.c \ @@ -63,9 +64,11 @@ CMDSRCS = \ cmdlf.c \ cmdlfem4x.c \ cmdlfhid.c \ + cmdlfhitag.c \ cmdlfti.c \ cmdparser.c \ - cmdmain.c + cmdmain.c \ + cmdlft55xx.c CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)