comparison 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
comparison
equal deleted inserted replaced
582:f3a61f28896e 588:9b300409c184
2 CONFIG += release 2 CONFIG += release
3 3
4 TEMPLATE = app 4 TEMPLATE = app
5 TARGET = EasyMercurial 5 TARGET = EasyMercurial
6 6
7 # We use the 10.4 SDK and Carbon for all 32-bit OS/X, 7 # We use the 10.5 SDK and Carbon for all 32-bit OS/X,
8 # and 10.6 with Cocoa for all 64-bit 8 # and 10.6 with Cocoa for all 64-bit. (Since EasyHg 1.2,
9 # we can sadly no longer build for 10.4 because we need
10 # the FSEvents API)
9 macx-g++40 { 11 macx-g++40 {
10 # Note, to use the 10.4 SDK on 10.6+ you need qmake -spec macx-g++40 12 # Note, to use the 10.4 SDK on 10.6+ you need qmake -spec macx-g++40
11 QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk 13 QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk
12 QMAKE_CFLAGS += -mmacosx-version-min=10.4 14 QMAKE_CFLAGS += -mmacosx-version-min=10.5
13 QMAKE_CXXFLAGS += -mmacosx-version-min=10.4 15 QMAKE_CXXFLAGS += -mmacosx-version-min=10.5
14 CONFIG += x86 ppc 16 CONFIG += x86 ppc
15 } 17 }
16 macx-g++ { 18 macx-g++ {
17 QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.6.sdk 19 QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.6.sdk
18 CONFIG += x86_64 20 CONFIG += x86_64
107 src/fswatcher.cpp \ 109 src/fswatcher.cpp \
108 src/findwidget.cpp 110 src/findwidget.cpp
109 111
110 macx-* { 112 macx-* {
111 SOURCES += src/common_osx.mm 113 SOURCES += src/common_osx.mm
112 LIBS += -framework Foundation 114 LIBS += -framework CoreServices -framework Foundation
113 ICON = easyhg-icon.icns 115 ICON = easyhg-icon.icns
114 } 116 }
115 117
116 linux* { 118 linux* {
117 LIBS += -lutil 119 LIBS += -lutil