X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8691f5b7bbe9138e9a4aa421da9a374536a8b556..ab4da50d99bb4334b86ff9bc8c5795723df37966:/client/Makefile?ds=sidebyside

diff --git a/client/Makefile b/client/Makefile
index b6d40c57..364070e8 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -3,6 +3,8 @@
 # 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 = -m32
@@ -14,14 +16,17 @@ LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
 
-platform = $(shell uname)
-
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
-MOC = moc
+MOC = $(QTDIR)/moc
+####################################################
+# Disabled gui for Windows, can someone with more
+# knowledge about QT fix this problem??
+####################################################
+QTLDLIBS=
 else ifeq ($(platform),Darwin)
-CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Version/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
+CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
 QTLDLIBS = -framework QtGui -framework QtCore
 MOC = moc 
 else
@@ -40,29 +45,40 @@ QTGUI = guidummy.o
 endif
 
 CMDSRCS = \
+			nonce2key/crapto1.c\
+			nonce2key/crypto1.c\
+			nonce2key/nonce2key.c\
+			mifarehost.c\
 			crc16.c \
 			iso14443crc.c \
+			iso15693tools.c \
 			data.c \
 			graph.c \
 			ui.c \
+			util.c \
 			cmddata.c \
 			cmdhf.c \
 			cmdhf14a.c \
 			cmdhf14b.c \
 			cmdhf15.c \
+			cmdhfepa.c \
 			cmdhflegic.c \
+			cmdhficlass.c \
+			cmdhfmf.c \
 			cmdhw.c \
 			cmdlf.c \
 			cmdlfem4x.c \
 			cmdlfhid.c \
+			cmdlfhitag.c \
 			cmdlfti.c \
 			cmdparser.c \
-			cmdmain.c
+			cmdmain.c \
+			uart.c
 
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 RM = rm -f
-BINS = proxmark3 snooper cli flasher
+BINS = proxmark3 flasher #snooper cli
 CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
 all: $(BINS)
@@ -95,6 +111,9 @@ proxguiqt.moc.cpp: proxguiqt.h
 clean:
 	$(RM) $(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