Mercurial > hg > sonic-visualiser
comparison capnp-regen.pri @ 1768:f684b19ab777
Fix for VC2017, plus add the generated files to the clean target
author | Chris Cannam |
---|---|
date | Fri, 16 Feb 2018 08:27:04 +0000 |
parents | efa35444e9c9 |
children | 33fd562a492b |
comparison
equal
deleted
inserted
replaced
1767:f635ca0a8781 | 1768:f684b19ab777 |
---|---|
12 capnpc.commands=$$PWD/sv-dependency-builds/win32-mingw/bin/capnp -I$$PWD/sv-dependency-builds/win32-mingw/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win32-mingw/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends | 12 capnpc.commands=$$PWD/sv-dependency-builds/win32-mingw/bin/capnp -I$$PWD/sv-dependency-builds/win32-mingw/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win32-mingw/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends |
13 } | 13 } |
14 | 14 |
15 win32-msvc* { | 15 win32-msvc* { |
16 # This config is actually for 64-bit Windows builds -- see | 16 # This config is actually for 64-bit Windows builds -- see |
17 # comments in noconfig.pri | 17 # comments in noconfig.pri. |
18 | |
19 # With MSVC2017 we have a problem that the header dependency is | |
20 # written out with the relative path from the build dir to the | |
21 # source dir (e.g. ..\sonic-visualiser\...) so if the header | |
22 # target path doesn't match that, the build fails before | |
23 # regenerating it. Not a problem with VC2015 for some reason. | |
24 # I hope using the relative path as target should fix it without | |
25 # breaking the VC2015 build. | |
26 | |
27 capnpc.target = ../$$basename(PWD)/piper-cpp/vamp-capnp/piper.capnp.h | |
18 capnpc.commands=$$PWD/sv-dependency-builds/win64-msvc/bin/capnp -I$$PWD/sv-dependency-builds/win64-msvc/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win64-msvc/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends | 28 capnpc.commands=$$PWD/sv-dependency-builds/win64-msvc/bin/capnp -I$$PWD/sv-dependency-builds/win64-msvc/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win64-msvc/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends |
19 } | 29 } |
20 | 30 |
21 QMAKE_EXTRA_TARGETS += capnpc | 31 QMAKE_EXTRA_TARGETS += capnpc |
22 PRE_TARGETDEPS += $$capnpc.target | 32 PRE_TARGETDEPS += $$capnpc.target |
33 QMAKE_CLEAN += $$capnpc.target | |
23 | 34 |