Mercurial > hg > tony
changeset 555:00aa19d02510
OK, switch back to assuming system installation of Boost headers for pYin
| author | Chris Cannam |
|---|---|
| date | Sun, 17 Feb 2019 10:04:28 +0000 |
| parents | 80868290cfd9 |
| children | 91e91fd8e9c0 |
| files | noconfig.pri pyin.pro repoint-lock.json |
| diffstat | 3 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/noconfig.pri Sat Feb 16 16:33:31 2019 +0000 +++ b/noconfig.pri Sun Feb 17 10:04:28 2019 +0000 @@ -62,6 +62,8 @@ INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include $$PWD/sv-dependency-builds/win32-mingw/include/opus + INCLUDEPATH += /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0 + LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE @@ -86,6 +88,8 @@ INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include $$PWD/sv-dependency-builds/win64-msvc/include/opus + INCLUDEPATH += /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0 + ## This seems to be intruding even when we're supposed to be release # CONFIG(debug) { # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \
--- a/pyin.pro Sat Feb 16 16:33:31 2019 +0000 +++ b/pyin.pro Sun Feb 17 10:04:28 2019 +0000 @@ -13,7 +13,7 @@ TARGET = pyin -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/sv-dependency-builds/any/include +INCLUDEPATH += $$PWD/vamp-plugin-sdk win32-msvc* { LIBS += -EXPORT:vampGetPluginDescriptor
--- a/repoint-lock.json Sat Feb 16 16:33:31 2019 +0000 +++ b/repoint-lock.json Sun Feb 17 10:04:28 2019 +0000 @@ -7,7 +7,7 @@ "pin": "4a7ebaaf9f53" }, "svgui": { - "pin": "e866102db32a" + "pin": "2e0d9e68343d" }, "svapp": { "pin": "6fd0ebfd2bbe" @@ -40,7 +40,7 @@ "pin": "7686116dcdd5" }, "sv-dependency-builds": { - "pin": "8f7fd4420df7" + "pin": "f3731af47c4b" }, "icons/scalable": { "pin": "1c8844bfa946"