From bb6295ea648b975e8d4fa4e1c597a4cd184d45f7 Mon Sep 17 00:00:00 2001 From: rjyao <576764733@qq.com> Date: Wed, 31 Aug 2016 17:03:27 +0800 Subject: [PATCH] fix Makefile and make it can work with QT5, now you can compiling with wiki easily. --- client/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/Makefile b/client/Makefile index 7f9c4c84..5400932c 100644 --- a/client/Makefile +++ b/client/Makefile @@ -29,9 +29,9 @@ ifneq (,$(findstring MINGW,$(platform))) QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4 endif else ifeq ($(platform),Darwin) - 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) + CXXFLAGS = $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets 2>/dev/null) -Wall -O4 + QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets 2>/dev/null) + MOC = $(shell pkg-config --variable=moc_location Qt5Core 2>/dev/null) LUAPLATFORM = macosx else CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4