]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
fixed windows compile
authorroel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Fri, 7 Dec 2012 08:44:45 +0000 (08:44 +0000)
committerroel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Fri, 7 Dec 2012 08:44:45 +0000 (08:44 +0000)
client/Makefile
client/cmdhfepa.c

index 8ddde4bdb2169dd55031f8a39bf1e744269e5d6a..9a9d322809f694c19b4cd7146e14d83eff3f5891 100644 (file)
@@ -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
 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
 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
index 2787b9695745bf94b491186390eb65d04b30077b..e285f02ccc915a6d4ca41744e68b3e0ab9c0e8ef 100644 (file)
@@ -14,6 +14,7 @@
 #include "cmdparser.h"
 #include "common.h"
 #include "cmdmain.h"
 #include "cmdparser.h"
 #include "common.h"
 #include "cmdmain.h"
+#include "sleep.h"
 
 #include "cmdhfepa.h"
 
 
 #include "cmdhfepa.h"
 
@@ -92,4 +93,4 @@ int CmdHFEPA(const char *Cmd)
        // parse
   CmdsParse(CommandTable, Cmd);
   return 0;
        // parse
   CmdsParse(CommandTable, Cmd);
   return 0;
-}
\ No newline at end of file
+}
Impressum, Datenschutz