diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-09-29 12:24:56 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-09-29 12:25:03 +0000 |
| commit | 39defaf848964fd8773d5162513dec4744a1d9f9 (patch) | |
| tree | a6d956266f1e15bc3b91208d33bbc855294aa1f2 | |
| parent | 32ae690c425912435491c0954193d3e1ec52ba59 (diff) | |
| download | poi-service-baserock/genivi-demo-platform.tar.gz | |
navit: Use navit from a submodulebaserock/genivi-demo-platform
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | src/navigation/.gitignore | 1 | ||||
| m--------- | src/navigation/navit | 0 | ||||
| -rw-r--r-- | src/navigation/script/1navit.mk | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 2e6c21f..9800f81 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "src/positioning"] path = src/positioning url = http://git.projects.genivi.org/lbs/positioning.git +[submodule "src/navigation/navit"] + path = src/navigation/navit + url = http://git.navit-project.org/navit.git diff --git a/src/navigation/.gitignore b/src/navigation/.gitignore deleted file mode 100644 index 26d5a0b..0000000 --- a/src/navigation/.gitignore +++ /dev/null @@ -1 +0,0 @@ -navit diff --git a/src/navigation/navit b/src/navigation/navit new file mode 160000 +Subproject 8396f6f94ef9a16db679e9de353242899966a73 diff --git a/src/navigation/script/1navit.mk b/src/navigation/script/1navit.mk index aeceb6c..8d1f0a0 100644 --- a/src/navigation/script/1navit.mk +++ b/src/navigation/script/1navit.mk @@ -53,8 +53,7 @@ $(navit_BIN)/Makefile: $(navit_SRC2)/CMakeLists.txt cd $(navit_BIN) && cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 $(navit_SRC2) $(navit_SRC2)/CMakeLists.txt: - cd $(navit_SRC)/.. && git clone $(navit_URL) - cd $(navit_SRC) && git checkout $(navit_VERSION) + true navit_map: $(navit_BIN)/navit/maps/switzerland.xml |