RM = rm -f
MV = mv
-#COMMON_FLAGS = -m32
-VPATH = ../common ../zlib
+ENV_LDFLAGS := $(LDFLAGS)
+ENV_CFLAGS := $(CFLAGS)
+VPATH = ../common ../zlib ../uart
OBJDIR = obj
LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
LUALIB = ../liblua/liblua.a
-LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
-LUAPLATFORM = generic
+JANSSONLIBPATH = ./jansson
+JANSSONLIB = $(JANSSONLIBPATH)/libjansson.a
+LDFLAGS = $(ENV_LDFLAGS)
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua -I$(JANSSONLIBPATH) -Wall -g -O3
+CXXFLAGS = -I../include -Wall -O3
+
+APP_CFLAGS =
+include ../common/Makefile_Enabled_Options.common
+CFLAGS += $(APP_CFLAGS)
+ifneq (,$(findstring WITH_SMARTCARD,$(APP_CFLAGS)))
+ SRC_SMARTCARD = cmdsmartcard.c
+else
+ SRC_SMARTCARD =
+endif
+LUAPLATFORM = generic
platform = $(shell uname)
ifneq (,$(findstring MINGW,$(platform)))
- CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
- ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
- CXXFLAGS += -I$(QTDIR)/include/QtWidgets
- QTLDLIBS = -L$(QTDIR)/lib -lQt5Core -lQt5Gui -lQt5Widgets
- else
- QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
- endif
- MOC = $(QTDIR)/bin/moc
LUAPLATFORM = mingw
else
- CXXFLAGS = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null) -Wall -O4
- QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
- MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
- ifeq ($(QTLDLIBS), )
- 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)
- endif
ifeq ($(platform),Darwin)
LUAPLATFORM = macosx
else
endif
endif
-ifneq ($(QTLDLIBS),)
+ifneq (,$(findstring WITH_GUI,$(APP_CFLAGS)))
+ # Check for correctly configured Qt5
+ QTINCLUDES = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null)
+ QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
+ MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
+ UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic
+ ifeq ($(QTINCLUDES), )
+ # if Qt5 not found check for correctly configured Qt4
+ QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
+ QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+ MOC = $(shell pkg-config --variable=moc_location QtCore)
+ UIC = $(shell pkg-config --variable=uic_location QtCore)
+ else
+ CXXFLAGS += -std=c++11 -fPIC
+ endif
+ ifeq ($(QTINCLUDES), )
+ # if both pkg-config commands failed, search in common places
+ ifneq ($(QTDIR), )
+ QTINCLUDES = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+ QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+ ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
+ QTINCLUDES += -I$(QTDIR)/include/QtWidgets
+ QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
+ CXXFLAGS += -std=c++11 -fPIC
+ endif
+ MOC = $(QTDIR)/bin/moc
+ UIC = $(QTDIR)/bin/uic
+ endif
+ endif
+endif
+
+
+ifneq ($(QTLDLIBS), )
QTGUIOBJS = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
CFLAGS += -DHAVE_GUI
else
# make temporary to final dependeny files after successful compilation
POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
-CORESRCS = uart.c \
- util.c
-CMDSRCS = crapto1/crapto1.c\
+CORESRCS = uart_posix.c \
+ uart_win32.c \
+ util.c \
+ util_posix.c \
+ ui.c \
+ comms.c
+
+CMDSRCS = $(SRC_SMARTCARD) \
+ crapto1/crapto1.c\
crapto1/crypto1.c\
+ polarssl/des.c \
+ polarssl/aes.c\
+ polarssl/bignum.c\
+ polarssl/rsa.c\
+ polarssl/sha1.c\
+ cliparser/argtable3.c\
+ cliparser/cliparser.c\
mfkey.c\
loclass/cipher.c \
loclass/cipherutils.c \
- loclass/des.c \
loclass/ikeys.c \
loclass/elite_crack.c\
loclass/fileutils.c\
crc64.c \
iso14443crc.c \
iso15693tools.c \
- data.c \
graph.c \
- ui.c \
cmddata.c \
lfdemod.c \
+ emv/crypto_polarssl.c\
+ emv/crypto.c\
+ emv/emv_pk.c\
+ emv/emv_pki.c\
+ emv/emv_pki_priv.c\
+ emv/test/cryptotest.c\
+ emv/apduinfo.c\
+ emv/dump.c\
+ emv/tlv.c\
+ emv/emv_tags.c\
+ emv/dol.c\
+ emv/emvcore.c\
+ emv/test/crypto_test.c\
+ emv/test/sda_test.c\
+ emv/test/dda_test.c\
+ emv/test/cda_test.c\
+ emv/cmdemv.c\
cmdhf.c \
+ cmdhflist.c \
cmdhf14a.c \
cmdhf14b.c \
cmdhf15.c \
cmdhficlass.c \
cmdhfmf.c \
cmdhfmfu.c \
+ cmdhfmfhard.c \
+ hardnested/hardnested_bruteforce.c \
cmdhftopaz.c \
cmdhw.c \
cmdlf.c \
cmdlfti.c \
cmdlfviking.c\
cmdlfvisa2000.c\
+ cmdlfpac.c\
cmdparser.c \
cmdmain.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\
+ protocols.c
+
+cpu_arch = $(shell uname -m)
+ifneq ($(findstring 86, $(cpu_arch)), )
+ MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
+endif
+ifneq ($(findstring amd64, $(cpu_arch)), )
+ MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
+endif
+ifeq ($(MULTIARCHSRCS), )
+ CMDSRCS += hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
+endif
ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
ZLIBFLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED
COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
-
+MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
+ $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
+ $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_SSE2.o) \
+ $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \
+ $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o)
+
+SUPPORTS_AVX512 := $(shell echo | gcc -E -mavx512f - > /dev/null 2>&1 && echo "True" )
+HARD_SWITCH_NOSIMD = -mno-mmx -mno-sse2 -mno-avx -mno-avx2
+HARD_SWITCH_MMX = -mmmx -mno-sse2 -mno-avx -mno-avx2
+HARD_SWITCH_SSE2 = -mmmx -msse2 -mno-avx -mno-avx2
+HARD_SWITCH_AVX = -mmmx -msse2 -mavx -mno-avx2
+HARD_SWITCH_AVX2 = -mmmx -msse2 -mavx -mavx2
+HARD_SWITCH_AVX512 = -mmmx -msse2 -mavx -mavx2 -mavx512f
+ifeq "$(SUPPORTS_AVX512)" "True"
+ HARD_SWITCH_NOSIMD += -mno-avx512f
+ HARD_SWITCH_MMX += -mno-avx512f
+ HARD_SWITCH_SSE2 += -mno-avx512f
+ HARD_SWITCH_AVX += -mno-avx512f
+ HARD_SWITCH_AVX2 += -mno-avx512f
+ MULTIARCHOBJS += $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX512.o)
+endif
+
BINS = proxmark3 flasher fpga_compress
WINBINS = $(patsubst %, %.exe, $(BINS))
-CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(OBJDIR)/*.o *.moc.cpp
+CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h
-all: lua_build $(BINS)
+# need to assign dependancies to build these first...
+all: lua_build jansson_build $(BINS)
all-static: LDLIBS:=-static $(LDLIBS)
all-static: proxmark3 flasher fpga_compress
-proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
-proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) lualibs/usb_cmd.lua
- $(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(LDLIBS) -o $@
+proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(QTLDLIBS)
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua
+ $(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS) -o $@
flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
$(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
$(LD) $(LDFLAGS) $(ZLIBFLAGS) $^ $(LDLIBS) -o $@
+proxgui.cpp: ui/ui_overlays.h
+
proxguiqt.moc.cpp: proxguiqt.h
$(MOC) -o$@ $^
+ui/ui_overlays.h: ui/overlays.ui
+ $(UIC) $^ > $@
+
lualibs/usb_cmd.lua: ../include/usb_cmd.h
awk -f usb_cmd_h2lua.awk $^ > $@
clean:
$(RM) $(CLEAN)
cd ../liblua && make clean
+ cd ./jansson && make clean
tarbin: $(BINS)
$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
lua_build:
@echo Compiling liblua, using platform $(LUAPLATFORM)
cd ../liblua && make $(LUAPLATFORM)
+
+jansson_build:
+ @echo Compiling jansson
+ cd ./jansson && make all
.PHONY: all clean
+$(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%.d
+ $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
+
+$(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%.d
+ $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<
+
+$(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%.d
+ $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<
+
+$(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%.d
+ $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<
+
+$(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%.d
+ $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<
+
+$(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%.d
+ $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<
+
%.o: %.c
$(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
$(CC) $(DEPFLAGS) $(CFLAGS) $(ZLIBFLAGS) -c -o $@ $<
%.o: %.cpp
$(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
- $(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
+ $(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
$(POSTCOMPILE)
# $(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
# $(POSTCOMPILE)
-DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS)) \
+DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS) $(MULTIARCHSRCS)) \
$(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
$(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d $(OBJDIR)/fpga_compress.d
.PRECIOUS: $(DEPENDENCY_FILES)
-include $(DEPENDENCY_FILES)
-
projects / proxmark3-svn / blobdiff