]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/Makefile
projects / proxmark3-svn / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Identation fix
[proxmark3-svn] / client / Makefile
diff --git a/client/Makefile b/client/Makefile
index 7954d1ea2de3aa3cfc3f768974b4ea708f7fe881..0d2ae25fc9a3640c5e16cdf0197c7014ee8c3456 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -3,69 +3,97 @@
 # at your option, any later version. See the LICENSE.txt file for the text of
 # the license.
 #-----------------------------------------------------------------------------
 # at your option, any later version. See the LICENSE.txt file for the text of
 # the license.
 #-----------------------------------------------------------------------------
-include ../common/Makefile.common
 
 
+CC = gcc
+CXX = g++
+LD = g++
+TAR = tar
+TARFLAGS = -C .. --ignore-failed-read -rvf
+RM = rm -f
+MV = mv
 
 
-CC=gcc
-CXX=g++
 #COMMON_FLAGS = -m32
 #COMMON_FLAGS = -m32
-VPATH = ../common
+VPATH = ../common ../zlib
 OBJDIR = obj
 
 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)
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
-LUAPLATFORM = generic
+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 = -I../include -Wall -O3
 
 
+LUAPLATFORM = generic
+platform = $(shell uname)
 ifneq (,$(findstring MINGW,$(platform)))
 ifneq (,$(findstring MINGW,$(platform)))
-    CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-    MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw
     LUAPLATFORM = mingw
-    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
-else ifeq ($(platform),Darwin)
-    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)
-    LUAPLATFORM = macosx
 else
 else
-    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)
-    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
+       ifeq ($(platform),Darwin)
+               LUAPLATFORM = macosx
+       else
+               LUALIB +=  -ldl
+               LDLIBS +=  -ltermcap -lncurses
+               LUAPLATFORM = linux
+       endif
 endif
 
 endif
 
+# 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
 
 
-ifneq ($(QTLDLIBS),)
-    QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
+
+ifneq ($(QTLDLIBS), )
+    QTGUIOBJS = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     CFLAGS += -DHAVE_GUI
     CFLAGS += -DHAVE_GUI
-    LINK.o = $(LINK.cpp)
 else
 else
-    QTGUI = guidummy.o
+    QTGUIOBJS = $(OBJDIR)/guidummy.o
 endif
 
 endif
 
+# Flags to generate temporary dependency files
+DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
+# make temporary to final dependeny files after successful compilation
+POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
+
 CORESRCS =     uart.c \
 CORESRCS =     uart.c \
-               util.c \
-               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\
+                       util.c \
+                       util_posix.c
+
+CMDSRCS =      crapto1/crapto1.c\
+                       crapto1/crypto1.c\
+                       mfkey.c\
+                       loclass/cipher.c \
+                       loclass/cipherutils.c \
+                       loclass/des.c \
+                       loclass/ikeys.c \
+                       loclass/elite_crack.c\
+                       loclass/fileutils.c\
+                       whereami.c\
                        mifarehost.c\
                        mifarehost.c\
+                       parity.c\
                        crc.c \
                        crc16.c \
                        crc64.c \
                        crc.c \
                        crc16.c \
                        crc64.c \
@@ -84,69 +112,183 @@ CMDSRCS =         nonce2key/crapto1.c\
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
-            cmdhfmfu.c \
+                       cmdhfmfu.c \
+                       cmdhfmfhard.c \
+                       hardnested/hardnested_bruteforce.c \
+                       cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdhw.c \
                        cmdlf.c \
-                       cmdlfio.c \
-                       cmdlfhid.c \
+                       cmdlfawid.c \
+                       cmdlfcotag.c\
                        cmdlfem4x.c \
                        cmdlfem4x.c \
+                       cmdlffdx.c \
+                       cmdlfgproxii.c \
+                       cmdlfhid.c \
                        cmdlfhitag.c \
                        cmdlfhitag.c \
+                       cmdlfio.c \
+                       cmdlfindala.c \
+                       cmdlfjablotron.c \
+                       cmdlfnexwatch.c \
+                       cmdlfnoralsy.c \
+                       cmdlfparadox.c \
+                       cmdlfpcf7931.c \
+                       cmdlfpresco.c \
+                       cmdlfpyramid.c \
+                       cmdlfsecurakey.c \
+                       cmdlft55xx.c \
                        cmdlfti.c \
                        cmdlfti.c \
+                       cmdlfviking.c\
+                       cmdlfvisa2000.c\
                        cmdparser.c \
                        cmdmain.c \
                        cmdparser.c \
                        cmdmain.c \
-                       cmdlft55xx.c \
-                       cmdlfpcf7931.c\
-                       pm3_binlib.c\
                        scripting.c\
                        cmdscript.c\
                        scripting.c\
                        cmdscript.c\
+                       pm3_binlib.c\
                        pm3_bitlib.c\
                        aes.c\
                        protocols.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\
+
+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)), )
+       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 
+#-DDEBUG -Dverbose=1
 
 
+QTGUISRCS = proxgui.cpp proxguiqt.cpp proxguiqt.moc.cpp guidummy.cpp
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 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)
 
 
-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
+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)
+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"
+       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
 
 
-all: lua_build $(BINS) 
+# need to assign dependancies to build these first...
+all: lua_build $(BINS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
-all-static: snooper cli flasher
-       
-proxmark3: LDLIBS+=$(QTLDLIBS)
-proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
-       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
+all-static: proxmark3 flasher fpga_compress
 
 
-snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
-       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
-
-cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
-       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
+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 $@
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
-       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
+       $(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 
-$(OBJDIR)/%.o: %.c
-       $(CC) $(CFLAGS) -c -o $@ $<
+fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
+       $(LD) $(LDFLAGS) $(ZLIBFLAGS) $^ $(LDLIBS) -o $@
 
 
-$(OBJDIR)/%.o: %.cpp
-       $(CXX) $(CXXFLAGS) -c -o $@ $<
+proxgui.cpp: ui/ui_overlays.h
 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 
 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
 
 tarbin: $(BINS)
 clean:
        $(RM) $(CLEAN)
        cd ../liblua && make clean
 
 tarbin: $(BINS)
-       $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)
+       $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
 
 lua_build:
        @echo Compiling liblua, using platform $(LUAPLATFORM)
        cd ../liblua && make $(LUAPLATFORM)
 
 .PHONY: all clean
 
 lua_build:
        @echo Compiling liblua, using platform $(LUAPLATFORM)
        cd ../liblua && make $(LUAPLATFORM)
 
 .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 $@ $<
+       $(POSTCOMPILE)
+
+%.o: %.cpp
+$(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
+       $(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
+       $(POSTCOMPILE)
+
+
+#$(CMDOBJS) $(COREOBJS): $(notdir $(%.c)) %.d
+#      $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
+#      $(POSTCOMPILE)
+
+#$(ZLIBOBJS): $(notdir $(%.c)) %.d
+#      $(CC) $(DEPFLAGS) $(CFLAGS) $(ZLIBFLAGS) -c -o $@ $<
+#      $(POSTCOMPILE)
+
+#$(QTGUIOBJS): $(notdir $(%.cpp)) %.d
+#      $(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
+#      $(POSTCOMPILE)
+
+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
+
+$(DEPENDENCY_FILES): ;
+.PRECIOUS: $(DEPENDENCY_FILES)
+
+-include $(DEPENDENCY_FILES)
+
Proxmark3 GIT tracking
Impressum, Datenschutz