Native libs: name with platform suffix, #14, #16

This commit is contained in:
Emux 2016-06-21 19:19:56 +03:00
parent dc46238af6
commit d2f61f9bfa
9 changed files with 7 additions and 7 deletions

View File

@ -10,7 +10,7 @@ dependencies {
compile project(':vtm-jeo')
compile project(':vtm-extras')
compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-jni-natives.jar")
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile 'com.android.support:support-v4:22.+'
compile 'com.android.support:appcompat-v7:22.+'

View File

@ -10,8 +10,8 @@ dependencies {
//compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
//compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
//compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
compile files('gdx-native-libs.jar')
compile files("${rootDir}/vtm-android/vtm-jni-natives.jar")
compile files('gdx-natives-android.jar')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
}
//task copyLibs(type: Copy) {

View File

@ -8,7 +8,7 @@ configurations {
dependencies {
compile project(':vtm-android')
compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-jni-natives.jar")
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile 'com.android.support:support-v4:22.+'
compile 'com.android.support:appcompat-v7:22.+'

View File

@ -7,7 +7,7 @@ configurations {
dependencies {
compile project(':vtm')
provided files('vtm-jni-natives.jar')
provided files('vtm-natives-android.jar')
compile 'com.android.support:support-v4:21.+'
//eclipseCompile project(':appcompat')

View File

@ -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-jni-natives.jar')
compile files('vtm-natives-desktop.jar')
}
run { ignoreExitValue = true }

View File

@ -10,7 +10,7 @@ mainClassName = 'org.oscim.gdx.GdxMapApp'
// package vtm native libs into jar
task copyLibs(type: Copy) {
from(zipTree("../vtm-desktop/vtm-jni-natives.jar"))
from(zipTree("../vtm-desktop/vtm-natives-desktop.jar"))
into("${buildDir}/assets")
}