X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/535b5a59bd3e8f424b3a4a523db5845d115ce49a..refs/pull/317/head:/client/Makefile

diff --git a/client/Makefile b/client/Makefile
index b7a529fc..0d2ae25f 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,96 +1,294 @@
-WINCC=c:\mingw\bin\gcc
-#COMMON_FLAGS = -m32
+#-----------------------------------------------------------------------------
+# This code is licensed to you under the terms of the GNU GPL, version 2 or,
+# at your option, any later version. See the LICENSE.txt file for the text of
+# the license.
+#-----------------------------------------------------------------------------
+
+CC = gcc
+CXX = g++
+LD = g++
+TAR = tar
+TARFLAGS = -C .. --ignore-failed-read -rvf
+RM = rm -f
+MV = mv
 
-VPATH = ../common
+#COMMON_FLAGS = -m32
+VPATH = ../common ../zlib
+OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
+LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g3
+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)))
+    LUAPLATFORM = mingw
+else
+	ifeq ($(platform),Darwin)
+		LUAPLATFORM = macosx
+	else
+		LUALIB +=  -ldl
+		LDLIBS +=  -ltermcap -lncurses
+		LUAPLATFORM = linux
+	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
 
-WINLIBS = -lgdi32 -lsetupapi
-CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
-QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 
-CMDSRCS = \
+ifneq ($(QTLDLIBS), )
+    QTGUIOBJS = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
+    CFLAGS += -DHAVE_GUI
+else
+    QTGUIOBJS = $(OBJDIR)/guidummy.o
+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 \
+			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\
+			parity.c\
+			crc.c \
 			crc16.c \
+			crc64.c \
 			iso14443crc.c \
+			iso15693tools.c \
 			data.c \
 			graph.c \
 			ui.c \
 			cmddata.c \
+			lfdemod.c \
 			cmdhf.c \
 			cmdhf14a.c \
 			cmdhf14b.c \
 			cmdhf15.c \
+			cmdhfepa.c \
 			cmdhflegic.c \
+			cmdhficlass.c \
+			cmdhfmf.c \
+			cmdhfmfu.c \
+			cmdhfmfhard.c \
+			hardnested/hardnested_bruteforce.c \
+			cmdhftopaz.c \
 			cmdhw.c \
 			cmdlf.c \
+			cmdlfawid.c \
+			cmdlfcotag.c\
 			cmdlfem4x.c \
+			cmdlffdx.c \
+			cmdlfgproxii.c \
 			cmdlfhid.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 \
+			cmdlfviking.c\
+			cmdlfvisa2000.c\
 			cmdparser.c \
-			cmdmain.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\
 
-CMDOBJS = $(CMDSRCS:.c=.o)
+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
 
-ifeq ($(shell echo ""),)
+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
 
-ifeq ($(shell uname),Darwin)
-CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
-QTLDLIBS = -framework QtGui -framework QtCore
-MOC = moc
-endif
+QTGUISRCS = proxgui.cpp proxguiqt.cpp proxguiqt.moc.cpp guidummy.cpp
 
-ifneq ($(QTLDLIBS),)
-QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
-CFLAGS += -DHAVE_GUI
-MOC ?= $(shell pkg-config --variable=moc_location QtCore)
-LINK.o = $(LINK.cpp)
-else
-QTGUI = guidummy.o
-endif
+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 snooper cli flasher
-CLEAN = cli flasher proxmark3 snooper *.o $(CMDOBJS) *.moc.cpp
-else
-RM = del
-BINS = prox.exe
-CLEAN = prox.exe
+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: $(BINS)
+# need to assign dependancies to build these first...
+all: lua_build $(BINS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
-all-static: snooper cli flasher
+all-static: proxmark3 flasher fpga_compress
 
-prox.exe: prox.c wingui.c $(CMDSRCS) flash.c
-	$(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c $(CMDSRCS) flash.c $(WINLIBS)
-	
-proxmark3: LDLIBS+=$(QTLDLIBS)
-proxmark3: proxmark3.o $(CMDOBJS) proxusb.o $(QTGUI)
+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 $@
 
-snooper: snooper.o $(CMDOBJS) proxusb.o guidummy.o
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
+	$(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
-cli: cli.o $(CMDOBJS) proxusb.o guidummy.o
+fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
+	$(LD) $(LDFLAGS) $(ZLIBFLAGS) $^ $(LDLIBS) -o $@
 
-flasher: flash.o flasher.o proxusb.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
+
+tarbin: $(BINS)
+	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
 
-# must be run as root
-install_kext: Info.plist
-	mkdir -p /System/Library/Extensions/Proxmark3.kext/Contents
-	cp Info.plist /System/Library/Extensions/Proxmark3.kext/Contents
-	chown -R root:wheel /System/Library/Extensions/Proxmark3.kext
-	chmod 755 /System/Library/Extensions/Proxmark3.kext /System/Library/Extensions/Proxmark3.kext/Contents
-	chmod 644 /System/Library/Extensions/Proxmark3.kext/Contents/Info.plist
-	rm -rf /System/Library/Caches/com.apple.kext.caches
-	touch /System/Library/Extensions
-	@echo "*** You may need to reboot for the kext to take effect."
+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)
+