changeset 1725:28302e07f851 vext

Rebuild capnp-generated files using sv-dependency-builds version of capnp tools on OSX. This would be better refactored into config and noconfig alternatives.
author Chris Cannam <cannam@all-day-breakfast.com>
date Wed, 05 Jul 2017 10:37:26 +0100
parents e4352ff029cf
children 580edea2489c
files INSTALL.txt base.pri vext-lock.json
diffstat 3 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/INSTALL.txt	Thu Jun 29 14:16:19 2017 +0100
+++ b/INSTALL.txt	Wed Jul 05 10:37:26 2017 +0100
@@ -17,7 +17,11 @@
 -----
 
 Build from the command line, but don't use the configure script.
-Instead install Qt v5.x and run the Qt "qmake" command, then "make".
+Instead install Qt v5.x and run
+
+$ ./vext install
+$ qmake -r  # you may need to use the full path to your Qt qmake here
+$ make
 
 
 Linux
--- a/base.pri	Thu Jun 29 14:16:19 2017 +0100
+++ b/base.pri	Wed Jul 05 10:37:26 2017 +0100
@@ -68,7 +68,12 @@
 
 capnpc.target = piper-cpp/vamp-capnp/piper-capnp.h
 capnpc.depends = piper/capnp/piper.capnp
-capnpc.commands = capnpc --src-prefix=piper/capnp -oc++:piper-cpp/vamp-capnp $$capnpc.depends
+
+capnpc.commands = capnp compile --src-prefix=piper/capnp -oc++:piper-cpp/vamp-capnp $$capnpc.depends
+
+macx* {
+    capnpc.commands=./sv-dependency-builds/osx/bin/capnp -Isv-dependency-builds/osx/include compile --src-prefix=piper/capnp -osv-dependency-builds/osx/bin/capnpc-c++:piper-cpp/vamp-capnp $$capnpc.depends
+}
 
 QMAKE_EXTRA_TARGETS += capnpc
 PRE_TARGETDEPS += $$capnpc.target
--- a/vext-lock.json	Thu Jun 29 14:16:19 2017 +0100
+++ b/vext-lock.json	Wed Jul 05 10:37:26 2017 +0100
@@ -37,7 +37,7 @@
       "pin": "d90244c003be"
     },
     "sv-dependency-builds": {
-      "pin": "eccd51b72864"
+      "pin": "a69c1527268d"
     },
     "icons/scalable": {
       "pin": "3d2cde3b1ab3"