Mercurial > hg > classical

changeset 53:bcea875d8d2f tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More build fixes
author Chris Cannam
date Thu, 16 Oct 2014 19:03:51 +0100
parents e0e12bd2978d
children
files utilities/composer/composer.cpp utilities/composer/composer.pro utilities/the-application/the-application.cpp utilities/the-application/the-application.pro utilities/widgettest/widgettest.cpp utilities/widgettest/widgettest.pro
diffstat 6 files changed, 19 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/utilities/composer/composer.cpp	Thu Oct 16 18:53:13 2014 +0100
+++ b/utilities/composer/composer.cpp	Thu Oct 16 19:03:51 2014 +0100
@@ -10,7 +10,6 @@
 #include <dataquay/objectmapper/ObjectStorer.h>
 #include <dataquay/objectmapper/ObjectMapper.h>
 #include <dataquay/objectmapper/TypeMapping.h>
-#include <dataquay/Debug.h>
 
 #include <QMultiMap>
 #include <QFileInfo>
@@ -21,6 +20,7 @@
 using namespace ClassicalData;
 using namespace std;
 
+/*
 ostream &operator<<(ostream &target, const QString &str)
 {
     return target << str.toLocal8Bit().data();
@@ -30,7 +30,7 @@
 {
     return target << "<" << u.toString() << ">";
 }
-
+*/
 
 bool
 load(BasicStore *store, QString fileName)
@@ -423,7 +423,7 @@
         storer->setTypeMapping(tm);
 
         storer->setPropertyStorePolicy(ObjectStorer::StoreIfChanged);
-        storer->setBlankNodePolicy(ObjectStorer::NoBlankNodes);
+        storer->setBlankNodePolicy(Dataquay::NeverUseBlankNodes);
 
         cerr << "Mapping results back to store...";
         storer->setFollowPolicy(ObjectStorer::FollowObjectProperties);
--- a/utilities/composer/composer.pro	Thu Oct 16 18:53:13 2014 +0100
+++ b/utilities/composer/composer.pro	Thu Oct 16 19:03:51 2014 +0100
@@ -2,16 +2,14 @@
 TARGET = composer
 #QT -= gui network xml
 
-load(../../../all.prf)
+CONFIG += debug
+
+QT += network
 
 SOURCES += composer.cpp
 
 PRE_TARGETDEPS += ../../common/libcommon.a
 
-INCLUDEPATH += ../../common
+INCLUDEPATH += ../../common ../../../dataquay ../../../sonic-visualiser/svcore
 
-DEPENDPATH += ../../../svcore
-INCLUDEPATH += ../../../svcore
-
-LIBS += ../../common/libcommon.a -L../../../svcore -lsvcore ../../../../dataquay/libdataquay.a
-
+LIBS += ../../common/libcommon.a -L../../../sonic-visualiser/svcore -lsvcore ../../../dataquay/libdataquay.a -lsndfile -lsamplerate -lid3tag -lmad -I/usr/include/sord-0 -I/usr/include/serd-0 -lsord-0 -lserd-0 -lvamp-hostsdk
--- a/utilities/the-application/the-application.cpp	Thu Oct 16 18:53:13 2014 +0100
+++ b/utilities/the-application/the-application.cpp	Thu Oct 16 19:03:51 2014 +0100
@@ -11,7 +11,6 @@
 #include <dataquay/objectmapper/ObjectStorer.h>
 #include <dataquay/objectmapper/ObjectMapper.h>
 #include <dataquay/objectmapper/TypeMapping.h>
-#include <dataquay/Debug.h>
 
 #include "data/fileio/AudioFileReaderFactory.h"
 #include "data/fileio/AudioFileReader.h"
@@ -33,7 +32,7 @@
 using namespace std;
 using namespace Vamp;
 using namespace Vamp::HostExt;
-
+/*
 ostream &operator<<(ostream &target, const QString &str)
 {
     return target << str.toLocal8Bit().data();
@@ -43,7 +42,7 @@
 {
     return target << "<" << u.toString() << ">";
 }
-
+*/
 
 bool
 load(BasicStore *store, QString fileName)
--- a/utilities/the-application/the-application.pro	Thu Oct 16 18:53:13 2014 +0100
+++ b/utilities/the-application/the-application.pro	Thu Oct 16 19:03:51 2014 +0100
@@ -2,13 +2,12 @@
 TARGET = the-application
 #QT -= gui network xml
 
-load(../../../all.prf)
+QT += widgets network
 
 SOURCES += the-application.cpp
 
 PRE_TARGETDEPS += ../../common/libcommon.a
 
-INCLUDEPATH += ../../common ../../../svcore
+INCLUDEPATH += ../../common ../../../dataquay ../../../sonic-visualiser/svcore
 
-LIBS += ../../common/libcommon.a -L../../../svcore -lsvcore ../../../../dataquay/libdataquay.a
-
+LIBS += ../../common/libcommon.a -L../../../sonic-visualiser/svcore -lsvcore ../../../dataquay/libdataquay.a -lsndfile -lsamplerate -lid3tag -lmad -I/usr/include/sord-0 -I/usr/include/serd-0 -lsord-0 -lserd-0 -lvamp-hostsdk
--- a/utilities/widgettest/widgettest.cpp	Thu Oct 16 18:53:13 2014 +0100
+++ b/utilities/widgettest/widgettest.cpp	Thu Oct 16 19:03:51 2014 +0100
@@ -8,7 +8,6 @@
 #include "Matcher.h"
 
 #include <dataquay/BasicStore.h>
-#include <dataquay/Debug.h>
 #include <dataquay/RDFException.h>
 #include <dataquay/objectmapper/ObjectLoader.h>
 #include <dataquay/objectmapper/TypeMapping.h>
@@ -21,6 +20,7 @@
 using namespace Dataquay;
 using namespace std;
 
+/*
 ostream &operator<<(ostream &target, const QString &str)
 {
     return target << str.toLocal8Bit().data();
@@ -30,6 +30,7 @@
 {
     return target << "<" << u.toString() << ">";
 }
+*/
 
 void
 usage(const char *name)
--- a/utilities/widgettest/widgettest.pro	Thu Oct 16 18:53:13 2014 +0100
+++ b/utilities/widgettest/widgettest.pro	Thu Oct 16 19:03:51 2014 +0100
@@ -1,16 +1,16 @@
 TEMPLATE = app
 TARGET = widgettest
 
-load(../../../all.prf)
+QT += gui widgets network
 
 PRE_TARGETDEPS += ../../common/libcommon.a ../../widgets/libwidgets.a
 
 INCLUDEPATH += ../../widgets ../../common
 
-DEPENDPATH += ../../../svcore
-INCLUDEPATH += ../../../svcore
+DEPENDPATH += ../../../sonic-visualiser/svcore
+INCLUDEPATH += ../../../sonic-visualiser/svcore ../../../dataquay
 
-LIBS += ../../widgets/libwidgets.a ../../common/libcommon.a -L../../../svcore -lsvcore ../../../../dataquay/libdataquay.a
+LIBS += ../../widgets/libwidgets.a ../../common/libcommon.a -L../../../sonic-visualiser/svcore -lsvcore ../../../dataquay/libdataquay.a -I/usr/include/sord-0 -I/usr/include/serd-0 -lsord-0 -lserd-0 -lvamp-hostsdk
 
 HEADERS += widgettest.h
 SOURCES += widgettest.cpp