changeset 616:32b8f32f14a6

Merge
author Chris Cannam
date Wed, 04 Jul 2012 16:15:15 +0100
parents 22695de8581c (diff) 4d44bad5a8ef (current diff)
children 2d5b831c1a0a
files easyhg.pro
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/easyhg.pro	Tue Jul 03 16:58:59 2012 +0100
+++ b/easyhg.pro	Wed Jul 04 16:15:15 2012 +0100
@@ -19,6 +19,11 @@
     QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.6.sdk
     CONFIG += x86_64
 }
+macx-llvm {
+    CONFIG += x86_64
+    QMAKE_CFLAGS += -mmacosx-version-min=10.6
+    QMAKE_CXXFLAGS += -mmacosx-version-min=10.6
+}
 
 unix {
     DESTDIR = .
@@ -109,8 +114,9 @@
     src/fswatcher.cpp \
     src/findwidget.cpp
 
+
 macx-* {
-    SOURCES += src/common_osx.mm
+    OBJECTIVE_SOURCES += src/common_osx.mm
     LIBS += -framework CoreServices -framework Foundation
     ICON = easyhg-icon.icns
 }