Mercurial > hg > svcore

changeset 796:c724b148576d qt5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add dataquay
author Chris Cannam
date Tue, 07 May 2013 16:54:36 +0100
parents dc20458f6f85
children c1fcfdf43a01
files config.pri.in data/fileio/test/test.pro svcore.pro
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/config.pri.in	Tue May 07 15:41:58 2013 +0100
+++ b/config.pri.in	Tue May 07 16:54:36 2013 +0100
@@ -7,7 +7,8 @@
 QMAKE_LINK = @CXX@
 
 QMAKE_CFLAGS += @CFLAGS@
-QMAKE_CXXFLAGS += @CXXFLAGS@ -I../dataquay
+QMAKE_CXXFLAGS += @CXXFLAGS@ 
+QMAKE_LFLAGS += @LDFLAGS@
 
 linux*:LIBS += -lasound
 
--- a/data/fileio/test/test.pro	Tue May 07 15:41:58 2013 +0100
+++ b/data/fileio/test/test.pro	Tue May 07 16:54:36 2013 +0100
@@ -1,7 +1,7 @@
 
 TEMPLATE = app
 
-LIBS += -L../../.. -L../../../debug -lsvcore
+LIBS += -L../../.. -L../../../debug -L../../../../dataquay -lsvcore -ldataquay
 
 win32-g++ {
     INCLUDEPATH += ../../../../sv-dependency-builds/win32-mingw/include
--- a/svcore.pro	Tue May 07 15:41:58 2013 +0100
+++ b/svcore.pro	Tue May 07 16:54:36 2013 +0100
@@ -17,15 +17,15 @@
 TARGET = svcore
 
 DEPENDPATH += . data plugin plugin/api/alsa
-INCLUDEPATH += . data plugin plugin/api/alsa
+INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay
 OBJECTS_DIR = o
 MOC_DIR = o
 
 win32-g++ {
-    INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include ../dataquay
+    INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include
 }
 win32-msvc* {
-    INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include ../dataquay
+    INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include
 }
 
 # Doesn't work with this library, which contains C99 as well as C++