# HG changeset patch
# User Chris Cannam
# Date 1341414915 -3600
# Node ID 32b8f32f14a65c54dbb817ae1fb4b6013e879326
# Parent  22695de8581c5dfa2bd637c167737460b903ed37# Parent  4d44bad5a8efc55d47d3b503fb7ee67261e05990
Merge

diff -r 4d44bad5a8ef -r 32b8f32f14a6 easyhg.pro
--- 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
 }