From: marshmellow42 <marshmellowrf@gmail.com>
Date: Mon, 29 Jun 2015 04:06:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master' into pm3+reveng
X-Git-Tag: v3.0.0~76^2~1
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/bf7ebb7b208a3b95f28a9a40f2e560a56e121794?hp=--cc

Merge remote-tracking branch 'upstream/master' into pm3+reveng

Conflicts:
	client/Makefile
---

bf7ebb7b208a3b95f28a9a40f2e560a56e121794
diff --cc client/Makefile
index bd8b891f,c454533d..ea532099
--- a/client/Makefile
+++ b/client/Makefile
@@@ -103,20 -103,19 +103,26 @@@ CMDSRCS = 	nonce2key/crapto1.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)