Mercurial > hg > svapp
changeset 527:8d873a022873 3.0-integration
Merge from branch "msvc2015_64"
| author | Chris Cannam |
|---|---|
| date | Thu, 20 Oct 2016 11:20:01 +0100 |
| parents | 1682dd81d0ef (current diff) 3ab6a5f7aca8 (diff) |
| children | 4826330c4f97 e59e66d8208d |
| files | |
| diffstat | 2 files changed, 18 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp Tue Sep 20 09:17:13 2016 +0100 +++ b/framework/MainWindowBase.cpp Thu Oct 20 11:20:01 2016 +0100 @@ -2246,13 +2246,17 @@ if (m_soundOptions & WithAudioInput) { m_audioIO = breakfastquay::AudioFactory:: createCallbackIO(m_recordTarget, m_playSource); - m_audioIO->suspend(); // start in suspended state - m_playSource->setSystemPlaybackTarget(m_audioIO); + if (m_audioIO) { + m_audioIO->suspend(); // start in suspended state + m_playSource->setSystemPlaybackTarget(m_audioIO); + } } else { m_playTarget = breakfastquay::AudioFactory:: createCallbackPlayTarget(m_playSource); - m_playTarget->suspend(); // start in suspended state - m_playSource->setSystemPlaybackTarget(m_playTarget); + if (m_playTarget) { + m_playTarget->suspend(); // start in suspended state + m_playSource->setSystemPlaybackTarget(m_playTarget); + } } if (!m_playTarget && !m_audioIO) {
--- a/svapp.pro Tue Sep 20 09:17:13 2016 +0100 +++ b/svapp.pro Thu Oct 20 11:20:01 2016 +0100 @@ -10,15 +10,18 @@ !exists(config.pri) { CONFIG += release - DEFINES += NDEBUG BUILD_RELEASE NO_TIMING + DEFINES += NDEBUG BUILD_RELEASE + DEFINES += NO_TIMING win32-g++ { INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include LIBS += -L../sv-dependency-builds/win32-mingw/lib } win32-msvc* { - INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include - LIBS += -L../sv-dependency-builds/win32-msvc/lib + # We actually expect MSVC to be used only for 64-bit builds, + # though the qmake spec is still called win32-msvc* + INCLUDEPATH += ../sv-dependency-builds/win64-msvc/include + LIBS += -L../sv-dependency-builds/win64-msvc/lib } macx* { INCLUDEPATH += ../sv-dependency-builds/osx/include @@ -31,6 +34,10 @@ macx* { DEFINES += HAVE_COREAUDIO HAVE_PORTAUDIO } + win32-msvc* { + DEFINES += NOMINMAX _USE_MATH_DEFINES + DEFINES -= HAVE_LIBLO + } } CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11