# HG changeset patch # User Chris Cannam # Date 1477328013 -3600 # Node ID 066d8c5f3b2127d6b97434d3d5e03a495abdcaa4 # Parent 4826330c4f9715dedd797385d55f95c1bb929b87 Cut down vastly on the number of config.pri files and places where their contents has to be effectively duplicated without them diff -r 4826330c4f97 -r 066d8c5f3b21 files.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/files.pri Mon Oct 24 17:53:33 2016 +0100 @@ -0,0 +1,28 @@ + +SVAPP_HEADERS += \ + audio/AudioCallbackPlaySource.h \ + audio/AudioRecordTarget.h \ + audio/AudioGenerator.h \ + audio/ClipMixer.h \ + audio/ContinuousSynth.h \ + audio/PlaySpeedRangeMapper.h \ + framework/Align.h \ + framework/Document.h \ + framework/MainWindowBase.h \ + framework/SVFileReader.h \ + framework/TransformUserConfigurator.h \ + framework/VersionTester.h + +SVAPP_SOURCES += \ + audio/AudioCallbackPlaySource.cpp \ + audio/AudioRecordTarget.cpp \ + audio/AudioGenerator.cpp \ + audio/ClipMixer.cpp \ + audio/ContinuousSynth.cpp \ + audio/PlaySpeedRangeMapper.cpp \ + framework/Align.cpp \ + framework/Document.cpp \ + framework/MainWindowBase.cpp \ + framework/SVFileReader.cpp \ + framework/TransformUserConfigurator.cpp \ + framework/VersionTester.cpp diff -r 4826330c4f97 -r 066d8c5f3b21 svapp.pro --- a/svapp.pro Thu Oct 20 14:07:06 2016 +0100 +++ b/svapp.pro Mon Oct 24 17:53:33 2016 +0100 @@ -2,43 +2,10 @@ TEMPLATE = lib INCLUDEPATH += ../vamp-plugin-sdk -DEFINES += HAVE_VAMP HAVE_VAMPHOSTSDK exists(config.pri) { include(config.pri) } -!exists(config.pri) { - - CONFIG += release - 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* { - # 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 - LIBS += -L../sv-dependency-builds/osx/lib - } - - win* { - DEFINES += HAVE_PORTAUDIO - } - 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 QT += network xml gui widgets @@ -50,31 +17,8 @@ OBJECTS_DIR = o MOC_DIR = o -HEADERS += audio/AudioCallbackPlaySource.h \ - audio/AudioRecordTarget.h \ - audio/AudioGenerator.h \ - audio/ClipMixer.h \ - audio/ContinuousSynth.h \ - audio/PlaySpeedRangeMapper.h +include(files.pri) -SOURCES += audio/AudioCallbackPlaySource.cpp \ - audio/AudioRecordTarget.cpp \ - audio/AudioGenerator.cpp \ - audio/ClipMixer.cpp \ - audio/ContinuousSynth.cpp \ - audio/PlaySpeedRangeMapper.cpp +HEADERS = $$(SVAPP_HEADERS) +SOURCES = $$(SVAPP_SOURCES) -HEADERS += framework/Align.h \ - framework/Document.h \ - framework/MainWindowBase.h \ - framework/SVFileReader.h \ - framework/TransformUserConfigurator.h \ - framework/VersionTester.h - -SOURCES += framework/Align.cpp \ - framework/Document.cpp \ - framework/MainWindowBase.cpp \ - framework/SVFileReader.cpp \ - framework/TransformUserConfigurator.cpp \ - framework/VersionTester.cpp -