X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/30a46ed86a7c531b5d2601d6ef74c717b28c330d..9f6e9d15755fdaefa4fee7a660cac988721268cd:/client/Makefile?ds=inline

diff --git a/client/Makefile b/client/Makefile
index 0ce06975..6d75b4bb 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -15,7 +15,7 @@ OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4 
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4 
 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
@@ -27,10 +27,15 @@ 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
 MOC = moc 
+LUAPLATFORM = macosx
 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
 endif
 
@@ -45,7 +50,8 @@ endif
 
 CORESRCS = 	uart.c \
 		util.c \
-		sleep.c \
+		sleep.c
+
 
 CMDSRCS = 	nonce2key/crapto1.c\
 		nonce2key/crypto1.c\
@@ -69,6 +75,7 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			cmdhw.c \
 			cmdlf.c \
 			cmdlfhid.c \
+			cmdlfio.c \
 			cmdlfem4x.c \
 			cmdlfhitag.c \
 			cmdlfti.c \
@@ -79,7 +86,7 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			pm3_binlib.c\
 			scripting.c\
 			cmdscript.c\
-
+			pm3_bitlib.c\
 
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
@@ -118,6 +125,7 @@ proxguiqt.moc.cpp: proxguiqt.h
 
 clean:
 	$(RM) $(CLEAN)
+	cd ../liblua && make clean
 
 tarbin: $(BINS)
 	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)