From: roel@libnfc.org Date: Mon, 28 Dec 2009 00:15:38 +0000 (+0000) Subject: cleaning up endless copy-paste of trace functionality X-Git-Tag: v1.0.0~427 X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/249deb42a0e044337a14f74d0a032b340aaaf68b cleaning up endless copy-paste of trace functionality --- diff --git a/client/Makefile b/client/Makefile index 2d516ac7..8786701f 100644 --- a/client/Makefile +++ b/client/Makefile @@ -11,11 +11,11 @@ CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) 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 +CXXFLAGS += -DQ_WS_MAC32 +CFLAGS += +QTLDLIBS += endif - +QTLDLIBS= ifneq ($(QTLDLIBS),) QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o CFLAGS += -DHAVE_GUI