Mercurial > hg > svcore
comparison svcore.pro @ 1222:771a17925576 piper
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Thu, 20 Oct 2016 11:19:34 +0100 |
parents | 385deb828b4a 6b847a59d908 |
children | ba16388b937d a2091d148d7f |
comparison
equal
deleted
inserted
replaced
1214:77320e522253 | 1222:771a17925576 |
---|---|
15 win32-g++ { | 15 win32-g++ { |
16 INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include | 16 INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include |
17 LIBS += -L../sv-dependency-builds/win32-mingw/lib | 17 LIBS += -L../sv-dependency-builds/win32-mingw/lib |
18 } | 18 } |
19 win32-msvc* { | 19 win32-msvc* { |
20 INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include | 20 # We actually expect MSVC to be used only for 64-bit builds, |
21 LIBS += -L../sv-dependency-builds/win32-msvc/lib | 21 # though the qmake spec is still called win32-msvc* |
22 INCLUDEPATH += ../sv-dependency-builds/win64-msvc/include | |
23 LIBS += -L../sv-dependency-builds/win64-msvc/lib | |
22 } | 24 } |
23 macx* { | 25 macx* { |
24 INCLUDEPATH += ../sv-dependency-builds/osx/include | 26 INCLUDEPATH += ../sv-dependency-builds/osx/include |
25 LIBS += -L../sv-dependency-builds/osx/lib | 27 LIBS += -L../sv-dependency-builds/osx/lib |
26 } | 28 } |
27 | 29 |
28 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_LIBLO HAVE_MAD HAVE_ID3TAG | 30 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_LIBLO HAVE_MAD HAVE_ID3TAG |
29 | 31 |
30 macx* { | 32 macx* { |
31 DEFINES += HAVE_COREAUDIO | 33 DEFINES += HAVE_COREAUDIO |
34 } | |
35 win32-msvc* { | |
36 DEFINES += NOMINMAX _USE_MATH_DEFINES | |
37 DEFINES -= HAVE_LIBLO | |
32 } | 38 } |
33 } | 39 } |
34 | 40 |
35 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11 | 41 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11 |
36 QT += network xml | 42 QT += network xml |
137 data/fileio/DataFileReader.h \ | 143 data/fileio/DataFileReader.h \ |
138 data/fileio/DataFileReaderFactory.h \ | 144 data/fileio/DataFileReaderFactory.h \ |
139 data/fileio/FileFinder.h \ | 145 data/fileio/FileFinder.h \ |
140 data/fileio/FileReadThread.h \ | 146 data/fileio/FileReadThread.h \ |
141 data/fileio/FileSource.h \ | 147 data/fileio/FileSource.h \ |
142 data/fileio/MatrixFile.h \ | |
143 data/fileio/MIDIFileReader.h \ | 148 data/fileio/MIDIFileReader.h \ |
144 data/fileio/MIDIFileWriter.h \ | 149 data/fileio/MIDIFileWriter.h \ |
145 data/fileio/MP3FileReader.h \ | 150 data/fileio/MP3FileReader.h \ |
146 data/fileio/OggVorbisFileReader.h \ | 151 data/fileio/OggVorbisFileReader.h \ |
147 data/fileio/PlaylistFileReader.h \ | 152 data/fileio/PlaylistFileReader.h \ |
195 data/fileio/CSVFileWriter.cpp \ | 200 data/fileio/CSVFileWriter.cpp \ |
196 data/fileio/CSVFormat.cpp \ | 201 data/fileio/CSVFormat.cpp \ |
197 data/fileio/DataFileReaderFactory.cpp \ | 202 data/fileio/DataFileReaderFactory.cpp \ |
198 data/fileio/FileReadThread.cpp \ | 203 data/fileio/FileReadThread.cpp \ |
199 data/fileio/FileSource.cpp \ | 204 data/fileio/FileSource.cpp \ |
200 data/fileio/MatrixFile.cpp \ | |
201 data/fileio/MIDIFileReader.cpp \ | 205 data/fileio/MIDIFileReader.cpp \ |
202 data/fileio/MIDIFileWriter.cpp \ | 206 data/fileio/MIDIFileWriter.cpp \ |
203 data/fileio/MP3FileReader.cpp \ | 207 data/fileio/MP3FileReader.cpp \ |
204 data/fileio/OggVorbisFileReader.cpp \ | 208 data/fileio/OggVorbisFileReader.cpp \ |
205 data/fileio/PlaylistFileReader.cpp \ | 209 data/fileio/PlaylistFileReader.cpp \ |