Mercurial > hg > svcore
diff config.pri.in @ 808:67003fb58ba4
Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.
author | Chris Cannam |
---|---|
date | Tue, 14 May 2013 12:36:05 +0100 |
parents | c724b148576d |
children | 79f7af8873c9 |
line wrap: on
line diff
--- a/config.pri.in Wed May 08 09:36:49 2013 +0100 +++ b/config.pri.in Tue May 14 12:36:05 2013 +0100 @@ -1,17 +1,19 @@ CONFIG += @QMAKE_CONFIG@ -DEFINES += @HAVES@ +DEFINES += @HAVES@ HAVE_DATAQUAY QMAKE_CC = @CC@ QMAKE_CXX = @CXX@ QMAKE_LINK = @CXX@ QMAKE_CFLAGS += @CFLAGS@ -QMAKE_CXXFLAGS += @CXXFLAGS@ +QMAKE_CXXFLAGS += @CXXFLAGS@ +QMAKE_LFLAGS += @LDFLAGS@ linux*:LIBS += -lasound -macx*:DEFINES += HAVE_COREAUDIO +macx*:DEFINES += HAVE_COREAUDIO MACOSX_DEPLOYMENT_TARGET=1060 + macx*:LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices LIBS += @LIBS@