X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Femul%2Femul.mk;h=779d9220b86dc152f78ae528083b3aa81bdef7ba;hb=976d522209efc4c11a019ae6b34657b6b3f59ba0;hp=b7ddf358557ff090e4b0c9fce8aa4df5a977a8b1;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/emul/emul.mk b/bertos/emul/emul.mk
index b7ddf358..779d9220 100644
--- a/bertos/emul/emul.mk
+++ b/bertos/emul/emul.mk
@@ -1,13 +1,22 @@
 #
-# Copyright 2007 Bernardo Innocenti (http://www.codewiz.org/)
+# Copyright 2007 Bernie Innocenti (http://www.codewiz.org/)
 # All rights reserved.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Author: Bernie Innocenti <bernie@codewiz.org>
 #
-# Qt configuration for devlib emulator demo.  Include it from
+# Qt configuration for BeRTOS emulator.  Include it from
 # your app Makefile fragment
 
-EMUL_CFLAGS = $(shell pkg-config QtCore QtGui --cflags) -DQT_CLEAN_NAMESPACE -DQT3_SUPPORT
-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
+