X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5ed2c738ed5b4357617ad5f54cc716ef5ae01182..a808a224f54ef44b7399b291ec9d8bcf758e43da:/client/Makefile

diff --git a/client/Makefile b/client/Makefile
index 2d516ac7..79e6eb2e 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,58 +1,109 @@
-WINCC=c:\mingw\bin\gcc
-
+#-----------------------------------------------------------------------------
+# 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 = -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)
+VPATH = ../common
+OBJDIR = obj
 
-WINLIBS = -lgdi32 -lsetupapi
-CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
-QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread
+LDFLAGS = $(COMMON_FLAGS)
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4
 
-ifeq ($(shell uname),Darwin)
+ifneq (,$(findstring MINGW,$(platform)))
+CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+MOC = $(QTDIR)/bin/moc
+else ifeq ($(platform),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
+MOC = moc 
+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)
 endif
 
+
 ifneq ($(QTLDLIBS),)
-QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
+QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
 CFLAGS += -DHAVE_GUI
-MOC ?= $(shell pkg-config --variable=moc_location QtCore)
 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o
 endif
 
-ifeq ($(shell echo ""),)
+CORESRCS = 	uart.c \
+		util.c \
+		sleep.c
+
+
+CMDSRCS = 	nonce2key/crapto1.c\
+		nonce2key/crypto1.c\
+		nonce2key/nonce2key.c\
+			mifarehost.c\
+			crc16.c \
+			iso14443crc.c \
+			iso15693tools.c \
+			data.c \
+			graph.c \
+			ui.c \
+			cmddata.c \
+			cmdhf.c \
+			cmdhf14a.c \
+			cmdhf14b.c \
+			cmdhf15.c \
+			cmdhfepa.c \
+			cmdhflegic.c \
+			cmdhficlass.c \
+			cmdhfmf.c \
+			cmdhw.c \
+			cmdlf.c \
+			cmdlfhid.c \
+			cmdlfem4x.c \
+			cmdlfhitag.c \
+			cmdlfti.c \
+			cmdparser.c \
+			cmdmain.c \
+			cmdlft55xx.c \
+			cmdlfpcf7931.c
+
+COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
+CMDOBJS = $(CMDSRCS:%.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 #snooper cli
+CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
 all: $(BINS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher
-
-prox.exe: prox.c wingui.c command.c
-	$(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c command.c $(WINLIBS)
 	
 proxmark3: LDLIBS+=$(QTLDLIBS)
-proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
+	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
+
+snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
+	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-command.o: command.c
+cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
+	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-snooper: snooper.o gui.o command.o usb.o guidummy.o
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
+	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-cli: cli.o gui.o command.o usb.o guidummy.o
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
-flasher: flasher.o usb.o
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 proxguiqt.moc.cpp: proxguiqt.h
 	$(MOC) -o$@ $^
@@ -60,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