X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/daf8b85cdaed21ace94bae1a49526d09ea389c73..1f1f1955dc6521b9934d04677e9a3b5f23fa0e72:/client/Makefile?ds=inline

diff --git a/client/Makefile b/client/Makefile
index d7126da6..a6b1942f 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -9,12 +9,13 @@ include ../common/Makefile.common
 CC=gcc
 CXX=g++
 #COMMON_FLAGS = -m32
-VPATH = ../common
+VPATH = ../common ../zlib
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
+LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../tools -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
@@ -35,14 +36,14 @@ else ifeq ($(platform),Darwin)
 else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+    LUALIB +=  -ldl
+    LDLIBS +=  -ltermcap -lncurses
     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
 
-
 ifneq ($(QTLDLIBS),)
     QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     CFLAGS += -DHAVE_GUI
@@ -53,19 +54,20 @@ endif
 
 CORESRCS = 	uart.c \
 		util.c \
-		sleep.c
-
-
-CMDSRCS = 	nonce2key/crapto1.c\
-		nonce2key/crypto1.c\
-		nonce2key/nonce2key.c\
-		loclass/cipher.c \
-		loclass/cipherutils.c \
-		loclass/des.c \
-		loclass/ikeys.c \
-		loclass/elite_crack.c\
-		loclass/fileutils.c\
+
+
+CMDSRCS = 	crapto1/crapto1.c\
+			crapto1/crypto1.c\
+			mfkey.c\
+			loclass/cipher.c \
+			loclass/cipherutils.c \
+			loclass/des.c \
+			loclass/ikeys.c \
+			loclass/elite_crack.c\
+			loclass/fileutils.c\
+			whereami.c\
 			mifarehost.c\
+			parity.c\
 			crc.c \
 			crc16.c \
 			crc64.c \
@@ -84,40 +86,67 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			cmdhflegic.c \
 			cmdhficlass.c \
 			cmdhfmf.c \
-            cmdhfmfu.c \
+			cmdhfmfu.c \
+			cmdhftopaz.c \
 			cmdhw.c \
 			cmdlf.c \
-			cmdlfio.c \
-			cmdlfhid.c \
+			cmdlfawid.c \
+			cmdlfcotag.c\
 			cmdlfem4x.c \
+			cmdlffdx.c \
+			cmdlfgproxii.c \
+			cmdlfhid.c \
 			cmdlfhitag.c \
+			cmdlfio.c \
+			cmdlfindala.c \
+			cmdlfjablotron.c \
+			cmdlfnexwatch.c \
+			cmdlfnoralsy.c \
+			cmdlfparadox.c \
+			cmdlfpcf7931.c \
+			cmdlfpresco.c \
+			cmdlfpyramid.c \
+			cmdlfsecurakey.c \
+			cmdlft55xx.c \
 			cmdlfti.c \
+			cmdlfviking.c\
+			cmdlfvisa2000.c\
 			cmdparser.c \
 			cmdmain.c \
-			cmdlft55xx.c \
-			cmdlfpcf7931.c\
-			pm3_binlib.c\
 			scripting.c\
 			cmdscript.c\
+			pm3_binlib.c\
 			pm3_bitlib.c\
 			aes.c\
 			protocols.c\
 			sha1.c\
+			cmdcrc.c\
+			reveng/reveng.c\
+			reveng/cli.c\
+			reveng/bmpbit.c\
+			reveng/model.c\
+			reveng/poly.c\
+			reveng/getopt.c\
+
+ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
+ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
+#-DDEBUG -Dverbose=1
 
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
+ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
 
 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
+BINS = proxmark3 flasher fpga_compress #snooper cli
+CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe fpga_compress fpga_compress.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
 all: lua_build $(BINS) 
 
 all-static: LDLIBS:=-static $(LDLIBS)
-all-static: snooper cli flasher
-	
-proxmark3: LDLIBS+=$(QTLDLIBS)
+all-static: snooper cli flasher fpga_compress
+
+proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
 proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
@@ -130,8 +159,11 @@ cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
+fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
+	$(CXX) $(CXXFLAGS) $(ZLIB_FLAGS) $^ $(LDLIBS) -o $@
+
 $(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(ZLIB_FLAGS) -c -o $@ $<
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<