#-----------------------------------------------------------------------------
include ../common/Makefile.common
-
-CC=gcc
-CXX=g++
+CC = gcc
+CXX = g++
#COMMON_FLAGS = -m32
-VPATH = ../common
+COMMON_FLAGS = -std=c99 -O3 -mpopcnt -march=native
+#VPATH = ../common ../zlib
OBJDIR = obj
-LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
-LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
+LUALIB = ../liblua/liblua.a
+#LDFLAGS = $(COMMON_FLAGS)
+CFLAGS = $(COMMON_FLAGS) -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall -g
LUAPLATFORM = generic
-ifneq (,$(findstring MINGW,$(platform)))
+ifneq (,$(findstring MINGW,$(platform)))
+ LDLIBS += -L/mingw/lib -lgdi32
+ CFLAGS += -I/mingw/include
CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
MOC = $(QTDIR)/bin/moc
LUAPLATFORM = mingw
else
QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
endif
+
+ # QT version, 4 or 5
+ qtplatform = $(shell $(MOC) -v)
+ ifneq (, $(findstring moc 5,$(qtplatform)))
+ 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
+ else
+ CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+ QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+ endif
+
else ifeq ($(platform),Darwin)
- CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
+ LDLIBS = -L/opt/local/lib -lreadline -lpthread -lm
+ CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
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
+ CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
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
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\
- mifarehost.c\
+CMDSRCS = nonce2key/crapto1.c \
+ nonce2key/crypto1.c \
+ nonce2key/nonce2key.c \
+ nonce2key/crypto1_bs.c \
+ loclass/cipher.c \
+ loclass/cipherutils.c \
+ loclass/des.c \
+ loclass/ikeys.c \
+ loclass/elite_crack.c \
+ loclass/fileutils.c \
+ mifarehost.c \
+ parity.c \
crc.c \
crc16.c \
crc64.c \
cmdhficlass.c \
cmdhfmf.c \
cmdhfmfu.c \
+ cmdhfmfhard.c \
+ cmdhfmfdes.c \
+ cmdhftopaz.c \
cmdhw.c \
cmdlf.c \
cmdlfio.c \
cmdlfhid.c \
+ cmdlfawid.c \
cmdlfem4x.c \
cmdlfhitag.c \
cmdlfti.c \
cmdparser.c \
cmdmain.c \
cmdlft55xx.c \
- cmdlfpcf7931.c\
- pm3_binlib.c\
- scripting.c\
- cmdscript.c\
- pm3_bitlib.c\
- aes.c\
- protocols.c\
- sha1.c\
-
+ cmdlfpcf7931.c \
+ cmdlfviking.c \
+ cmdlfpresco.c \
+ cmdlfpyramid.c \
+ cmdlfguard.c \
+ pm3_binlib.c \
+ scripting.c \
+ cmdscript.c \
+ pm3_bitlib.c \
+ aes.c \
+ protocols.c \
+ sha1.c \
+ sha256.c \
+ cmdcrc.c \
+ reveng/preset.c \
+ reveng/reveng.c \
+ reveng/cli.c \
+ reveng/bmpbit.c \
+ reveng/model.c \
+ reveng/poly.c \
+ reveng/getopt.c \
+ tea.c \
+ prng.c \
+ radixsort.c \
+ bucketsort.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
+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
+all-static: $(BINS)
-proxmark3: LDLIBS+=$(QTLDLIBS)
+proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -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 $@ $<
projects / proxmark3-svn / blobdiff