From: martin.holst@gmail.com Date: Wed, 26 Jun 2013 11:02:37 +0000 (+0000) Subject: Added lua-mac building, added cleaning of lua files X-Git-Tag: v1.0.0~80^2~16 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/3a4c72fe596b9a66aede12747aad10c9e407c883?hp=ea833d39fffb17fb5b3a68c92299616ecc5675ee Added lua-mac building, added cleaning of lua files --- diff --git a/client/Makefile b/client/Makefile index 0ce06975..1f2f23e8 100644 --- a/client/Makefile +++ b/client/Makefile @@ -27,6 +27,7 @@ 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) @@ -118,6 +119,7 @@ proxguiqt.moc.cpp: proxguiqt.h clean: $(RM) $(CLEAN) + cd ../liblua && make clean tarbin: $(BINS) $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)