diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2017-01-16 17:54:24 +0100 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2017-01-16 17:54:24 +0100 |
| commit | c0aaaac03e49ba60c8bc5ed9ad87a25d8e84582d (patch) | |
| tree | f7fc818c3b017c22947a98ffdbd197c79221b034 | |
| parent | b846f4288848d1d528e858829fcf3909c017d419 (diff) | |
| download | poi-service-c0aaaac03e49ba60c8bc5ed9ad87a25d8e84582d.tar.gz | |
alignment with latest navit version, improvement of build (thanks to jandegr)
5 files changed, 6 insertions, 6 deletions
diff --git a/src/navigation/build.sh b/src/navigation/build.sh index 6eebc53..31b6bce 100755 --- a/src/navigation/build.sh +++ b/src/navigation/build.sh @@ -86,13 +86,13 @@ then echo 'build navit' if [ "$clean" = 1 ] then - cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../navit/ + cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -DBUILD_MAPTOOL=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../navit/ fi make else if [ "$clean" = 1 ] then - cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../navit/ + cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -DBUILD_MAPTOOL=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../navit/ make fi fi diff --git a/src/navigation/clone_and_build.sh b/src/navigation/clone_and_build.sh index cd91596..a5f411e 100755 --- a/src/navigation/clone_and_build.sh +++ b/src/navigation/clone_and_build.sh @@ -2,7 +2,7 @@ build_option="" positioning_version='f341b4a2cb216d6204136794d33076170ab1bf80' -navit_version='0a8f85666a3b849d70ed450d74bed3cf85466630' +navit_version='72a9284980f0ff6b8dd3972c0c15b3945c94559c' echo "version of positioning is: $positioning_version" echo "version of navit is: $navit_version" diff --git a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx index 1275ff7..b065e1b 100644 --- a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx @@ -291,5 +291,5 @@ void plugin_init(void) // Common API data init runtime = CommonAPI::Runtime::get(); - plugin_register_vehicle_type("enhancedposition", vehicle_enhancedposition_new); + plugin_register_category_vehicle("enhancedposition", vehicle_enhancedposition_new); } diff --git a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx index fc9243c..1572255 100644 --- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx @@ -278,5 +278,5 @@ void plugin_init(void) conn->setup(&dispatcher); dbg(lvl_debug,"enter\n"); - plugin_register_vehicle_type("enhancedposition", vehicle_enhancedposition_new); + plugin_register_category_vehicle("enhancedposition", vehicle_enhancedposition_new); } diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx index 750a85b..4e2183f 100644 --- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx +++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx @@ -838,7 +838,7 @@ GuidanceObj::~GuidanceObj() navigation_unregister_callback(get_navigation(), attr_navigation_speech, m_guidance_callback); callback_destroy(m_guidance_callback); } - m_guidance->GuidanceStatusChanged(GENIVI_NAVIGATIONCORE_INACTIVE, 0); + m_guidance->GuidanceStatusChanged(GENIVI_NAVIGATIONCORE_INACTIVE, m_route_handle); #if (SPEECH_ENABLED) delete(m_speechoutput); #endif |