From 4c1123f234a975a1c041054ea183e5b0bd20015a Mon Sep 17 00:00:00 2001 From: duplo Date: Thu, 4 Dec 2008 17:13:54 +0000 Subject: [PATCH] Added support for Mac Os X compilation without pkg-config utility. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1973 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/emul/emul.mk | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/bertos/emul/emul.mk b/bertos/emul/emul.mk index ad1391ad..779d9220 100644 --- a/bertos/emul/emul.mk +++ b/bertos/emul/emul.mk @@ -7,8 +7,16 @@ # Qt configuration for BeRTOS emulator. Include it from # your app Makefile fragment -EMUL_CFLAGS = -D'ARCH=(ARCH_EMUL|ARCH_QT)' \ - $(shell pkg-config QtCore QtGui --cflags) -DQT_CLEAN_NAMESPACE -EMUL_LDFLAGS = $(shell pkg-config QtCore QtGui --libs) -QT_MOC = $(shell pkg-config QtCore --variable=moc_location) -#QT_UIC = $(shell pkg-config QtCore --variable=uic_location) +#On Darwin architecture environment variables need a different configuration. +ifeq ($(shell uname | grep -c "Darwin"),1) + EMUL_CFLAGS = -D'ARCH=(ARCH_EMUL|ARCH_QT)' -DQT_CLEAN_NAMESPACE + EMUL_LDFLAGS = -framework QtGui -framework QtCore + QT_MOC = /usr/bin/moc +#On other platforms. +else + EMUL_CFLAGS = -D'ARCH=(ARCH_EMUL|ARCH_QT)' $(shell pkg-config QtCore QtGui --cflags) -DQT_CLEAN_NAMESPACE + EMUL_LDFLAGS = $(shell pkg-config QtCore QtGui --libs) + QT_MOC = $(shell pkg-config QtCore --variable=moc_location) + #QT_UIC = $(shell pkg-config QtCore --variable=uic_location) +endif + -- 2.25.1