From: bushing Date: Wed, 30 Dec 2009 00:49:27 +0000 (+0000) Subject: Fix QT CXXFLAGS/LDFLAGS X-Git-Tag: v1.0.0~418 X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f39c4119e0687fd35689fb971687e9bb1585ffe8 Fix QT CXXFLAGS/LDFLAGS --- diff --git a/client/Makefile b/client/Makefile index 8786701f..2d516ac7 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 += -DQ_WS_MAC32 -CFLAGS += -QTLDLIBS += +CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers +QTLDLIBS = -framework QtGui -framework QtCore +MOC = moc endif -QTLDLIBS= + ifneq ($(QTLDLIBS),) QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o CFLAGS += -DHAVE_GUI