X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/806dc07542ab956f376811e59b4dca8f9c98af89..427cdbe2cd097b09ae6aee2bf707b68e056aaf45:/client/Makefile

diff --git a/client/Makefile b/client/Makefile
index 35f31167..3967360a 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -16,19 +16,27 @@ 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 
+LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 MOC = $(QTDIR)/bin/moc
+LUAPLATFORM = mingw
 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
 
 
@@ -74,9 +82,12 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			cmdmain.c \
 			cmdlft55xx.c \
 			cmdlfpcf7931.c\
+			pm3_binlib.c\
+			scripting.c\
 			cmdscript.c\
 
 
+
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
@@ -113,6 +124,7 @@ proxguiqt.moc.cpp: proxguiqt.h
 
 clean:
 	$(RM) $(CLEAN)
+	cd ../liblua && make clean
 
 tarbin: $(BINS)
 	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)
@@ -129,7 +141,7 @@ install_kext: Info.plist
 	@echo "*** You may need to reboot for the kext to take effect."
 
 lua_build:
-	@echo Compiling liblua;
-	cd ../liblua && make linux
+	@echo Compiling liblua, using platform $(LUAPLATFORM)
+	cd ../liblua && make $(LUAPLATFORM)
 
 .PHONY: all clean