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=-c

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

Conflicts:
	client/Makefile
---

bf7ebb7b208a3b95f28a9a40f2e560a56e121794
diff --combined client/Makefile
index bd8b891f,c454533d..ea532099
--- a/client/Makefile
+++ b/client/Makefile
@@@ -9,12 -9,13 +9,13 @@@ include ../common/Makefile.commo
  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 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
  LUAPLATFORM = generic
  
  ifneq (,$(findstring MINGW,$(platform)))
@@@ -35,14 -36,13 +36,13 @@@ 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
      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
@@@ -84,7 -84,7 +84,7 @@@ CMDSRCS = 	nonce2key/crapto1.c
  			cmdhflegic.c \
  			cmdhficlass.c \
  			cmdhfmf.c \
 -            cmdhfmfu.c \
 +			cmdhfmfu.c \
  			cmdhw.c \
  			cmdlf.c \
  			cmdlfio.c \
@@@ -103,27 -103,26 +103,33 @@@
  			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 $@
  
@@@ -136,8 -135,11 +142,11 @@@ cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDO
  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 $@ $<