diff platform-dataquay.pri @ 134:565bc0c2295d

Merge
author Chris Cannam
date Mon, 13 Oct 2014 10:16:20 +0100
parents d012c0dafa36
children 3f7c65f26559
line wrap: on
line diff
--- a/platform-dataquay.pri	Mon Oct 13 10:00:54 2014 +0100
+++ b/platform-dataquay.pri	Mon Oct 13 10:16:20 2014 +0100
@@ -10,10 +10,17 @@
 EXTRALIBS -= -lrdf
 
 DEFINES += USE_SORD
-QMAKE_CXXFLAGS += -I/usr/local/include/sord-0 -I/usr/local/include/serd-0 -I/usr/include/sord-0 -I/usr/include/serd-0
-EXTRALIBS += -lsord-0 -lserd-0
+# Libraries and paths should be added by config.pri
 
-win32-g++: {
+win32-g++ {
     INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include
     LIBS += -L../../sv-dependency-builds/win32-mingw/lib
 }
+win32-msvc* {
+    INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include
+    LIBS += -L../../sv-dependency-builds/win32-msvc/lib
+}
+mac* {
+    INCLUDEPATH += ../sv-dependency-builds/osx/include
+    LIBS += -L../sv-dependency-builds/osx/lib
+}