X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6e4d4ee6096285692f247a44b59be7888bef9dd0..36dc0b437017bf360787afe3c15fd3cbaf941dd2:/client/Makefile

diff --git a/client/Makefile b/client/Makefile
index 8bbc0273..26ecb962 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,75 +1,223 @@
-WINCC=c:\mingw\bin\gcc
-
-#COMMON_FLAGS = -m32
-
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
-LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g3
-
-WINLIBS = -lgdi32 -lsetupapi
-CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
-QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-
-ifeq ($(shell echo ""),)
-
-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
+#-----------------------------------------------------------------------------
+# 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.
+#-----------------------------------------------------------------------------
+include ../common/Makefile.common
+
+CC = gcc
+CXX = g++
+COMMON_FLAGS += -std=c99 -O3 -mpopcnt -march=native -g
+
+#VPATH = ../common ../zlib
+OBJDIR = obj
+
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
+LUALIB = ../liblua/liblua.a
+#LDFLAGS = $(COMMON_FLAGS)
+CFLAGS =  $(COMMON_FLAGS) -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall
+LUAPLATFORM = generic
+
+ifneq (,$(findstring MINGW,$(platform))) 
+    LDLIBS +=  -L/mingw/lib -lgdi32
+	CFLAGS +=  -I/mingw/include -D__USE_MINGW_ANSI_STDIO=1
+    CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+    MOC = $(QTDIR)/bin/moc
+    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
+
+	# QT version,  4 or 5
+	qtplatform = $(shell $(MOC) -v)
+	ifneq (, $(findstring moc 5,$(qtplatform)))
+	   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
+	   QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
+	else
+	   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+	   QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+	endif
+	
+else ifeq ($(platform),Darwin)
+
+	# OS X, QT5 detection needs this.
+	export PKG_CONFIG_PATH=/usr/local/Cellar/qt5/5.6.1-1/lib/pkgconfig/
+
+	CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
+    QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+    MOC = $(shell pkg-config --variable=moc_location QtCore)
+
+	# QT version,  4 or 5
+	qtplatform = $(shell $(MOC) -v)
+	ifneq (, $(findstring moc 5,$(qtplatform)))
+		# use this if you have QT5 installed.
+		CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include -I/usr/local/opt/qt5/include 
+		LDLIBS = -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -lreadline -lpthread -lm
+	else
+		# Assuming you have QT4 installed.
+		CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include
+		LDLIBS = -L/usr/local/opt/readline/lib -lreadline -lpthread -lm
+	endif
+
+    LUAPLATFORM = macosx
+else
+    CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
+    QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+    LUALIB +=  -ldl
+    LDLIBS +=  -ltermcap -lncurses
+    MOC = $(shell pkg-config --variable=moc_location QtCore)
+    # 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
 endif
 
 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)
+    QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
+    CFLAGS += -DHAVE_GUI
+    LINK.o = $(LINK.cpp)
 else
-QTGUI = guidummy.o
+    QTGUI = guidummy.o
 endif
 
+CORESRCS =  uart.c \
+			util.c \
+			sleep.c
+
+CMDSRCS =	mifarehost.c \
+			nonce2key/crapto1.c \
+			nonce2key/crypto1.c \
+			nonce2key/nonce2key.c \
+			nonce2key/crypto1_bs.c \
+			loclass/cipher.c \
+			loclass/cipherutils.c \
+			loclass/des.c \
+			loclass/ikeys.c \
+			loclass/elite_crack.c \
+			loclass/fileutils.c \
+			parity.c \
+			crc.c \
+			crc16.c \
+			crc64.c \
+			iso14443crc.c \
+			legic_prng.c \
+			iso15693tools.c \
+			data.c \
+			graph.c \
+			ui.c \
+			cmddata.c \
+			lfdemod.c \
+			cmdanalyse.c \
+			cmdhf.c \
+			cmdhf14a.c \
+			cmdhf14b.c \
+			cmdhf15.c \
+			cmdhfepa.c \
+			cmdhflegic.c \
+			cmdhficlass.c \
+			cmdhfmf.c \
+            cmdhfmfu.c \
+			cmdhfmfhard.c \
+			cmdhfmfdes.c \
+			cmdhftopaz.c \
+			cmdhfemv.c \
+			cmdhw.c \
+			cmdlf.c \
+			cmdlfio.c \
+			cmdlfhid.c \
+			cmdlfawid.c \
+			cmdlfem4x.c \
+			cmdlfhitag.c \
+			cmdlfti.c \
+			cmdparser.c \
+			cmdmain.c \
+			cmdlft55xx.c \
+			cmdlfpcf7931.c \
+			cmdlfviking.c \
+			cmdlfpresco.c \
+			cmdlfpyramid.c \
+			cmdlfguard.c \
+			cmdlfnedap.c \
+			cmdlfjablotron.c \
+			cmdlfvisa2000.c \
+			cmdlfnoralsy.c \
+			cmdlffdx.c \
+			cmdlfcotag.c \
+			pm3_binlib.c \
+			scripting.c \
+			cmdscript.c \
+			pm3_bitlib.c \
+			aes.c \
+			protocols.c \
+			sha1.c \
+			sha256.c \
+			cmdcrc.c \
+			reveng/preset.c \
+			reveng/reveng.c \
+			reveng/cli.c \
+			reveng/bmpbit.c \
+			reveng/model.c \
+			reveng/poly.c \
+			reveng/getopt.c \
+			tea.c \
+			prng.c \
+			bucketsort.c
+#			radixsort.c \
+
+		
+ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
+ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
+#-DDEBUG -Dverbose=1
+
+COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
+CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
+ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
+
 RM = rm -f
-BINS = proxmark3 snooper cli flasher
-CLEAN = cli flasher proxmark3 snooper *.o *.moc.cpp
-else
-RM = del
-BINS = prox.exe
-CLEAN = prox.exe
-endif
+BINS = proxmark3 flasher fpga_compress
+CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe fpga_compress fpga_compress.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
-all: $(BINS)
+all: lua_build $(BINS) 
 
 all-static: LDLIBS:=-static $(LDLIBS)
-all-static: snooper cli flasher
-
-prox.exe: prox.c wingui.c command.c flash.c
-	$(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c command.c flash.c $(WINLIBS)
+all-static: $(BINS)
 	
-proxmark3: LDLIBS+=$(QTLDLIBS)
-proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
+proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
+	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-command.o: command.c
+snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
+	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-snooper: snooper.o gui.o command.o usb.o guidummy.o
+cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
+	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-cli: cli.o gui.o command.o usb.o guidummy.o
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
+	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-flasher: flash.o flasher.o usb.o
+fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
+	$(CXX) $(CXXFLAGS) $(ZLIB_FLAGS) $^ $(LDLIBS) -o $@
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) $(ZLIB_FLAGS) -c -o $@ $<
+
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 proxguiqt.moc.cpp: proxguiqt.h
 	$(MOC) -o$@ $^
 
 clean:
 	$(RM) $(CLEAN)
+	cd ../liblua && make clean
+
+tarbin: $(BINS)
+	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=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