Mercurial > hg > sonic-visualiser
diff noconfig.pri @ 1827:e63cc95876cb baselib-win-build
Alternative build mechanism for Windows, with base as a library and a single script to run full builds
author | Chris Cannam |
---|---|
date | Thu, 24 May 2018 16:19:50 +0100 |
parents | e4cf3ec06955 |
children | 98bec50c3c2e |
line wrap: on
line diff
--- a/noconfig.pri Fri May 18 13:49:23 2018 +0100 +++ b/noconfig.pri Thu May 24 16:19:50 2018 +0100 @@ -30,6 +30,7 @@ # these. LIBS += \ + -lbase \ -lbz2 \ -lrubberband \ -lfftw3 \ @@ -56,9 +57,9 @@ # This config is currently used for 32-bit Windows builds. - INCLUDEPATH += sv-dependency-builds/win32-mingw/include + INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include - LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib -L../sonic-visualiser/sv-dependency-builds/win32-mingw/lib + LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE @@ -78,7 +79,7 @@ # we want to do 32-bit builds with MSVC as well, then we'll # need to add a way to distinguish the two. - INCLUDEPATH += sv-dependency-builds/win64-msvc/include + INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include ## This seems to be intruding even when we're supposed to be release # CONFIG(debug) { @@ -88,7 +89,7 @@ # } CONFIG(release) { LIBS += -Lrelease \ - -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib + -L$$PWD/sv-dependency-builds/win64-msvc/lib } DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE @@ -113,8 +114,8 @@ # All Mac builds are 64-bit these days. - INCLUDEPATH += sv-dependency-builds/osx/include - LIBS += -Lsv-dependency-builds/osx/lib + INCLUDEPATH += $$PWD/sv-dependency-builds/osx/include + LIBS += -L$$PWD/sv-dependency-builds/osx/lib QMAKE_CXXFLAGS_RELEASE += -O3 -ffast-math