summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2014-10-05 18:14:24 +0000
committerJames Thomas <james.thomas@codethink.co.uk>2014-10-05 18:32:38 +0000
commit5be481226ff6cda307b47741fafe6e89cc6d3319 (patch)
tree9071ff05cd58c9831126428a99d0b37c4f54d3ce
parentf0059dd8b992d5e2163a530c8d42890c05600055 (diff)
downloadnavigation-baserock/genivi/navigation-service.tar.gz
-rw-r--r--src/poi-service/poi-server/poi-server.pro6
-rw-r--r--src/poi-service/script/poi-server.mk2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/poi-service/poi-server/poi-server.pro b/src/poi-service/poi-server/poi-server.pro
index 1d02b16..f46e07b 100644
--- a/src/poi-service/poi-server/poi-server.pro
+++ b/src/poi-service/poi-server/poi-server.pro
@@ -15,12 +15,12 @@ HEADERS += \
poi-datamodel.h
INCLUDEPATH += /usr/include/glibmm-2.4 \
- /usr/lib/i386-linux-gnu/glibmm-2.4/include \
+ /usr/lib/glibmm-2.4/include \
/usr/include/glib-2.0 \
- /usr/lib/i386-linux-gnu/glib-2.0/include \
+ /usr/lib/glib-2.0/include \
/usr/include/dbus-c++-1 \
/usr/include/dbus-1.0 \
- /usr/lib/i386-linux-gnu/dbus-1.0/include
+ /usr/lib/dbus-1.0/include
LIBS += -lglibmm-2.4 \
-lglib-2.0 \
diff --git a/src/poi-service/script/poi-server.mk b/src/poi-service/script/poi-server.mk
index 02db469..b53815c 100644
--- a/src/poi-service/script/poi-server.mk
+++ b/src/poi-service/script/poi-server.mk
@@ -26,7 +26,7 @@
POI_SERVER_SRC_DIR=$(ROOT_DIR)/poi-server
POI_SERVER_BIN_DIR=$(BIN_DIR)/poi-server-bin
POI_SERVER_DEPS=libsqlite3-dev sqlite3 libdbus-c++-dev
-POI_SERVER_INCPATH=-I$(COMMON_DIR) -I$(POI_SERVER_SRC_DIR) -I/usr/include/glibmm-2.4 -I/usr/lib/i386-linux-gnu/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/dbus-c++-1 -I/usr/include/dbus-1.0 -I/usr/lib/i386-linux-gnu/dbus-1.0/include
+POI_SERVER_INCPATH=-I$(COMMON_DIR) -I$(POI_SERVER_SRC_DIR) -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/dbus-c++-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
POI_SERVER_LIBS=-lglibmm-2.4 -lglib-2.0 -lgobject-2.0 -lsqlite3 -ldbus-c++-glib-1 -ldbus-c++-1 -ldbus-1
POI_SERVER_LINK=g++
POI_SERVER_LFLAGS=-Wl,-O1