iso14a cleanup and implement RATS [Hagen Fritsch]

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 4eae4bc70295668e0134d98da4c43ab08ed97d10..368e2487f118fabddaa89bae73ffb5de4d249f31 100644 (file)
--- 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.
 #-----------------------------------------------------------------------------
 # 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
 CC=gcc
 CXX=g++
 #COMMON_FLAGS = -m32


@@ -14,19 +16,24 @@ 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
 
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
 

-CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
-QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-
-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 = 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
 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 -O3
+QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+MOC = $(shell pkg-config --variable=moc_location QtCore)

 endif
 
 endif
 

+

 ifneq ($(QTLDLIBS),)
 QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
 CFLAGS += -DHAVE_GUI
 ifneq ($(QTLDLIBS),)
 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
 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o


@@ -88,6 +95,9 @@ proxguiqt.moc.cpp: proxguiqt.h
 clean:
        $(RM) $(CLEAN)
 
 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
 # must be run as root
 install_kext: Info.plist
        mkdir -p /System/Library/Extensions/Proxmark3.kext/Contents