Mercurial > hg > easyhg
diff easyhg.pro @ 588:9b300409c184 easyhg_v1.2
Merge from branch "fswatcher"
author | Chris Cannam |
---|---|
date | Wed, 14 Mar 2012 12:14:50 +0000 |
parents | 4ed384ea7f39 |
children | 2985c2a90146 |
line wrap: on
line diff
--- a/easyhg.pro Wed Mar 07 15:25:33 2012 +0000 +++ b/easyhg.pro Wed Mar 14 12:14:50 2012 +0000 @@ -4,13 +4,15 @@ TEMPLATE = app TARGET = EasyMercurial -# We use the 10.4 SDK and Carbon for all 32-bit OS/X, -# and 10.6 with Cocoa for all 64-bit +# We use the 10.5 SDK and Carbon for all 32-bit OS/X, +# and 10.6 with Cocoa for all 64-bit. (Since EasyHg 1.2, +# we can sadly no longer build for 10.4 because we need +# the FSEvents API) macx-g++40 { # Note, to use the 10.4 SDK on 10.6+ you need qmake -spec macx-g++40 - QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk - QMAKE_CFLAGS += -mmacosx-version-min=10.4 - QMAKE_CXXFLAGS += -mmacosx-version-min=10.4 + QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk + QMAKE_CFLAGS += -mmacosx-version-min=10.5 + QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 CONFIG += x86 ppc } macx-g++ { @@ -109,7 +111,7 @@ macx-* { SOURCES += src/common_osx.mm - LIBS += -framework Foundation + LIBS += -framework CoreServices -framework Foundation ICON = easyhg-icon.icns }