Added lua-mac building, added cleaning of lua files

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 35f31167ab39960fcf9c3af27890a991bd79b716..1f2f23e87442dac671d5925e5d7c9b478a25dc9c 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -16,19 +16,23 @@ 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)
+LUAPLATFORM = linux
 endif
 
 
@@ -42,8 +46,7 @@ endif
 
 CORESRCS =     uart.c \
                util.c \
-               sleep.c
-
+               sleep.c \
 
 CMDSRCS =      nonce2key/crapto1.c\
                nonce2key/crypto1.c\
@@ -74,9 +77,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 +119,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 +136,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