Adjust LUA scripts to new ISO14A_NO_RATS option

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index cdb414795ed0c0d253f0de6bd3c7361fc274d3a7..3a96e9e928bccb59795f29f4f56b56566e52d3e7 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,15 +12,16 @@ TARFLAGS = -C .. --ignore-failed-read -rvf
 RM = rm -f
 MV = mv
 
 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
 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 -O3
-CXXFLAGS = -Wall -O3
+LDFLAGS = $(ENV_LDFLAGS)
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall -g -O3
+CXXFLAGS = -I../include -Wall -O3

 
 LUAPLATFORM = generic
 platform = $(shell uname)
 
 LUAPLATFORM = generic
 platform = $(shell uname)


@@ -78,15 +79,18 @@ DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
 # make temporary to final dependeny files after successful compilation
 POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
 
 # make temporary to final dependeny files after successful compilation
 POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
 

-CORESRCS =     uart.c \
-                       util.c
+CORESRCS =     uart_posix.c \
+                       uart_win32.c \
+                       util.c \
+                       util_posix.c

 
 CMDSRCS =      crapto1/crapto1.c\
                        crapto1/crypto1.c\
 
 CMDSRCS =      crapto1/crapto1.c\
                        crapto1/crypto1.c\

+                       polarssl/des.c \
+                       polarssl/aes.c\

                        mfkey.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        mfkey.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \

-                       loclass/des.c \

                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\


@@ -138,13 +142,13 @@ CMDSRCS =         crapto1/crapto1.c\
                        cmdlfti.c \
                        cmdlfviking.c\
                        cmdlfvisa2000.c\
                        cmdlfti.c \
                        cmdlfviking.c\
                        cmdlfvisa2000.c\

+                       cmdlfpac.c\

                        cmdparser.c \
                        cmdmain.c \
                        scripting.c\
                        cmdscript.c\
                        pm3_binlib.c\
                        pm3_bitlib.c\
                        cmdparser.c \
                        cmdmain.c \
                        scripting.c\
                        cmdscript.c\
                        pm3_binlib.c\
                        pm3_bitlib.c\

-                       aes.c\

                        protocols.c\
                        sha1.c\
                        cmdcrc.c\
                        protocols.c\
                        sha1.c\
                        cmdcrc.c\


@@ -155,7 +159,16 @@ CMDSRCS =  crapto1/crapto1.c\
                        reveng/poly.c\
                        reveng/getopt.c\
 
                        reveng/poly.c\
                        reveng/getopt.c\
 

-MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.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 
 
 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 


@@ -170,22 +183,44 @@ MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_SSE2.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_SSE2.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \

-                       $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o) \
-                       $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX512.o)
+                       $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o)
+
+GCC_VERSION := $(shell gcc --version | awk '/gcc/{print $$NF;}' | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/')
+CLANG_VERSION := $(shell gcc --version | awk '/Apple LLVM version/{print $$4;}' | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/')
+ifneq ($(CLANG_VERSION), )
+       SUPPORTS_AVX512 :=  $(shell [ $(CLANG_VERSION) -ge 80000 ] && echo "True" )
+endif
+ifneq ($(GCC_VERSION), )
+       SUPPORTS_AVX512 :=  $(shell [ $(GCC_VERSION) -ge 40900 ] && echo "True" )
+endif
+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) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h
 
 # need to assign dependancies to build these first...
                        
 BINS = proxmark3 flasher fpga_compress
 WINBINS = $(patsubst %, %.exe, $(BINS))
 CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h
 
 # need to assign dependancies to build these first...

-all: ui/ui_overlays.h lua_build $(BINS)
+all: lua_build $(BINS)

 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
 proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
 proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)

-proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) lualibs/usb_cmd.lua
-       $(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(LDLIBS) -o $@
+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 $@
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
        $(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@


@@ -193,6 +228,8 @@ flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
 fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
        $(LD) $(LDFLAGS) $(ZLIBFLAGS) $^ $(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$@ $^
 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 


@@ -216,22 +253,22 @@ lua_build:
 .PHONY: all clean
 
 $(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%.d
 .PHONY: all clean
 
 $(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%.d

-       $(CC) $(DEPFLAGS) $(CFLAGS) -mno-mmx -mno-sse2 -mno-avx -mno-avx2 -mno-avx512f -c -o $@ $<
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<

 
 $(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%.d
 
 $(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%.d

-       $(CC) $(DEPFLAGS) $(CFLAGS) -mmmx -mno-sse2 -mno-avx -mno-avx2 -mno-avx512f -c -o $@ $<
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<

 
 $(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%.d
 
 $(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%.d

-       $(CC) $(DEPFLAGS) $(CFLAGS) -mmmx -msse2 -mno-avx -mno-avx2 -mno-avx512f -c -o $@ $<
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<

 
 $(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%.d
 
 $(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%.d

-       $(CC) $(DEPFLAGS) $(CFLAGS) -mmmx -msse2 -mavx -mno-avx2 -mno-avx512f -c -o $@ $<
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<

 
 $(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%.d
 
 $(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%.d

-       $(CC) $(DEPFLAGS) $(CFLAGS) -mmmx -msse2 -mavx -mavx2 -mno-avx512f -c -o $@ $<
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<

 
 $(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%.d
 
 $(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%.d

-       $(CC) $(DEPFLAGS) $(CFLAGS) -mmmx -msse2 -mavx -mavx2 -mavx512f -c -o $@ $<
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<

 
 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
 
 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d


@@ -256,7 +293,7 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
 #      $(CXX) $(DEPFLAGS) $(CXXFLAGS) -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
 
        $(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
        $(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d $(OBJDIR)/fpga_compress.d