]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/Makefile
Fix clock_gettime() for Apple OSX
[proxmark3-svn] / client / Makefile
index d05bdc447ad87a6572b76dc691e506903986220b..fd2ae29017525657003fa32f6a4ef92d1971632a 100644 (file)
@@ -85,10 +85,11 @@ CORESRCS =  uart_posix.c \
 
 CMDSRCS =      crapto1/crapto1.c\
                        crapto1/crypto1.c\
+                       polarssl/des.c \
+                       polarssl/aes.c\
                        mfkey.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \
-                       loclass/des.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\
@@ -140,13 +141,13 @@ CMDSRCS =         crapto1/crapto1.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\
@@ -161,7 +162,7 @@ cpu_arch = $(shell uname -m)
 ifneq ($(findstring 86, $(cpu_arch)), )
        MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
 endif
-ifneq ($(findstring 64, $(cpu_arch)), )
+ifneq ($(findstring amd64, $(cpu_arch)), )
        MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
 endif
 ifeq ($(MULTIARCHSRCS), )
@@ -183,14 +184,21 @@ MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o)
 
-GCC_GTEQ_490 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40900)
+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 "$(GCC_GTEQ_490)" "1"
+ifeq "$(SUPPORTS_AVX512)" "True"
        HARD_SWITCH_NOSIMD += -mno-avx512f
        HARD_SWITCH_MMX += -mno-avx512f
        HARD_SWITCH_SSE2 += -mno-avx512f
Impressum, Datenschutz