fixed windows compile

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 7224fe069fc23ca36fc466590a7884d1471e5f7e..9a9d322809f694c19b4cd7146e14d83eff3f5891 100644 (file)
--- 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,6 +64,7 @@ CMDSRCS = \
                        cmdlf.c \
                        cmdlfem4x.c \
                        cmdlfhid.c \
+                       cmdlfhitag.c \
                        cmdlfti.c \
                        cmdparser.c \
                        cmdmain.c