X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a763eb2126133f32ff44d7e49b5dcadc4f764206..8d0a3e87d7d2350f4a05698a42f57625e460e5d6:/client/Makefile

diff --git a/client/Makefile b/client/Makefile
index ff701a9f..83d00260 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -5,6 +5,7 @@
 #-----------------------------------------------------------------------------
 include ../common/Makefile.common
 
+
 CC=gcc
 CXX=g++
 #COMMON_FLAGS = -m32
@@ -12,24 +13,30 @@ CXX=g++
 VPATH = ../common
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread
+LDLIBS =  -L/mingw/lib -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lm -lreadline -lpthread -lcrypto -lgdi32
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4
+CFLAGS = -std=c99 -I. -I../include -I../common -I/mingw/include -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4 $(ICE_FLAGS)
+LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
-CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
+QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
 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 
+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 = 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
 
 
@@ -49,7 +56,14 @@ CORESRCS = 	uart.c \
 CMDSRCS = 	nonce2key/crapto1.c\
 		nonce2key/crypto1.c\
 		nonce2key/nonce2key.c\
-			mifarehost.c\
+			loclass/cipher.c \
+			loclass/cipherutils.c \
+			loclass/des.c \
+			loclass/ikeys.c \
+			loclass/elite_crack.c \
+			loclass/fileutils.c \
+			loclass/hash1_brute.c \
+			mifarehost.c \
 			crc16.c \
 			iso14443crc.c \
 			iso15693tools.c \
@@ -57,6 +71,7 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			graph.c \
 			ui.c \
 			cmddata.c \
+			lfdemod.c \
 			cmdhf.c \
 			cmdhf14a.c \
 			cmdhf14b.c \
@@ -65,8 +80,13 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			cmdhflegic.c \
 			cmdhficlass.c \
 			cmdhfmf.c \
+			cmdhfmfu.c \
+			cmdhfmfdes.c \
+            cmdhfdes.c \
 			cmdhw.c \
 			cmdlf.c \
+			cmdlfawid26.c \
+			cmdlfio.c \
 			cmdlfhid.c \
 			cmdlfem4x.c \
 			cmdlfhitag.c \
@@ -74,7 +94,12 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			cmdparser.c \
 			cmdmain.c \
 			cmdlft55xx.c \
-			cmdlfpcf7931.c
+			cmdlfpcf7931.c\
+			pm3_binlib.c\
+			scripting.c\
+			cmdscript.c\
+			pm3_bitlib.c\
+
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
@@ -83,7 +108,7 @@ RM = rm -f
 BINS = proxmark3 flasher #snooper cli
 CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
-all: $(BINS)
+all: lua_build $(BINS) 
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher
@@ -112,6 +137,7 @@ proxguiqt.moc.cpp: proxguiqt.h
 
 clean:
 	$(RM) $(CLEAN)
+	cd ../liblua && make clean
 
 tarbin: $(BINS)
 	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)
@@ -127,4 +153,8 @@ install_kext: Info.plist
 	touch /System/Library/Extensions
 	@echo "*** You may need to reboot for the kext to take effect."
 
+lua_build:
+	@echo Compiling liblua, using platform $(LUAPLATFORM)
+	cd ../liblua && make $(LUAPLATFORM)
+
 .PHONY: all clean