VTM native libraries for Android and Desktop (Win, Mac, Linux), closes

#14
mapsforge · Jun 17, 2016 · 3ea5af2 · 3ea5af2
1 parent e85ec48
commit 3ea5af2
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ target/
 build/
 *.o
 *.so
-*.jar
 *.class
 /vtm-web/war/
 /vtm-web/assets/

diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle
@@ -10,7 +10,7 @@ dependencies {
   compile project(':vtm-jeo')
   compile project(':vtm-extras')
   compile project(':vtm-themes')
-  compile files("${rootDir}/vtm-ext-libs/native-libs.jar")
+  compile files("${rootDir}/vtm-android/vtm-jni-natives.jar")
 
   compile 'com.android.support:support-v4:22.+'
   compile 'com.android.support:appcompat-v7:22.+'

diff --git a/vtm-android-gdx/build.gradle b/vtm-android-gdx/build.gradle
@@ -10,7 +10,7 @@ dependencies {
   //compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
   //compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
   compile files("${rootDir}/vtm-ext-libs/gdx/gdx-native-libs.jar")
-  compile files("${rootDir}/vtm-ext-libs/native-libs.jar")
+  compile files("${rootDir}/vtm-android/vtm-jni-natives.jar")
 }
 
 //task copyLibs(type: Copy) {

diff --git a/vtm-android-start/build.gradle b/vtm-android-start/build.gradle
@@ -8,7 +8,7 @@ configurations {
 dependencies {
   compile project(':vtm-android')
   compile project(':vtm-themes')
-  compile files("${rootDir}/vtm-ext-libs/native-libs.jar")
+  compile files("${rootDir}/vtm-android/vtm-jni-natives.jar")
 
   compile 'com.android.support:support-v4:22.+'
   compile 'com.android.support:appcompat-v7:22.+'

diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle
@@ -7,7 +7,7 @@ configurations {
 
 dependencies {
   compile project(':vtm')
-  provided files("${rootDir}/vtm-ext-libs/native-libs.jar")
+  provided files('vtm-jni-natives.jar')
 
   compile 'com.android.support:support-v4:21.+'
   eclipseCompile project(':appcompat')

diff --git a/vtm-android/vtm-jni-natives.jar b/vtm-android/vtm-jni-natives.jar
diff --git a/vtm-desktop/build.gradle b/vtm-desktop/build.gradle
@@ -34,7 +34,7 @@ dependencies {
   compile "com.badlogicgames.gdx:gdx-backend-jglfw:$gdxVersion"
   compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
   compile 'org.slf4j:slf4j-simple:1.7.6'
-  compile files('../vtm-ext-libs/gdx/vtm-jni-natives.jar')
+  compile files('vtm-jni-natives.jar')
 }
 
 run { ignoreExitValue = true }
diff --git a/vtm-desktop/vtm-jni-natives.jar b/vtm-desktop/vtm-jni-natives.jar
diff --git a/vtm-playground/build.gradle b/vtm-playground/build.gradle
@@ -10,7 +10,7 @@ mainClassName = 'org.oscim.gdx.GdxMapApp'
 
 // package vtm native libs into jar
 task copyLibs(type: Copy) {
-  from(zipTree("../vtm-ext-libs/gdx/vtm-jni-natives.jar"))
+  from(zipTree("../vtm-desktop/vtm-jni-natives.jar"))
   into("${buildDir}/assets")
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ target/ @@
     build/
     *.o
     *.so
-    *.jar
     *.class
     /vtm-web/war/
     /vtm-web/assets/
@@ Expand Down @@