From 5ed2c738ed5b4357617ad5f54cc716ef5ae01182 Mon Sep 17 00:00:00 2001 From: bushing Date: Sun, 27 Dec 2009 23:27:29 +0000 Subject: [PATCH] fix Mac build to use Qt framework (e.g. http://get.qt.nokia.com/qt/source/qt-mac-cocoa-opensource-4.6.0.dmg) --- client/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/Makefile b/client/Makefile index 007bb4b6..2d516ac7 100644 --- a/client/Makefile +++ b/client/Makefile @@ -11,15 +11,15 @@ 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 += -arch i386 -DQ_WS_MAC32 -CFLAGS += -arch i386 -QTLDLIBS += -arch i386 +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 ifneq ($(QTLDLIBS),) QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o CFLAGS += -DHAVE_GUI -MOC = $(shell pkg-config --variable=moc_location QtCore) +MOC ?= $(shell pkg-config --variable=moc_location QtCore) LINK.o = $(LINK.cpp) else QTGUI = guidummy.o -- 2.39.5