From d2f61f9bfab27197fca7e3bb6ff230d23a0b476f Mon Sep 17 00:00:00 2001 From: Emux Date: Tue, 21 Jun 2016 19:19:56 +0300 Subject: [PATCH] Native libs: name with platform suffix, #14, #16 --- vtm-android-example/build.gradle | 2 +- vtm-android-gdx/build.gradle | 4 ++-- ...{gdx-native-libs.jar => gdx-natives-android.jar} | Bin vtm-android-start/build.gradle | 2 +- vtm-android/build.gradle | 2 +- ...{vtm-jni-natives.jar => vtm-natives-android.jar} | Bin vtm-desktop/build.gradle | 2 +- ...{vtm-jni-natives.jar => vtm-natives-desktop.jar} | Bin vtm-playground/build.gradle | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename vtm-android-gdx/{gdx-native-libs.jar => gdx-natives-android.jar} (100%) rename vtm-android/{vtm-jni-natives.jar => vtm-natives-android.jar} (100%) rename vtm-desktop/{vtm-jni-natives.jar => vtm-natives-desktop.jar} (100%) diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle index 04510c26..c5665c41 100644 --- 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-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.+' diff --git a/vtm-android-gdx/build.gradle b/vtm-android-gdx/build.gradle index aea5a428..8e1abcec 100644 --- a/vtm-android-gdx/build.gradle +++ b/vtm-android-gdx/build.gradle @@ -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) { diff --git a/vtm-android-gdx/gdx-native-libs.jar b/vtm-android-gdx/gdx-natives-android.jar similarity index 100% rename from vtm-android-gdx/gdx-native-libs.jar rename to vtm-android-gdx/gdx-natives-android.jar diff --git a/vtm-android-start/build.gradle b/vtm-android-start/build.gradle index c5027f68..287dfe96 100644 --- 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-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.+' diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle index 6b46d6d9..3c24a9f3 100644 --- a/vtm-android/build.gradle +++ b/vtm-android/build.gradle @@ -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') diff --git a/vtm-android/vtm-jni-natives.jar b/vtm-android/vtm-natives-android.jar similarity index 100% rename from vtm-android/vtm-jni-natives.jar rename to vtm-android/vtm-natives-android.jar diff --git a/vtm-desktop/build.gradle b/vtm-desktop/build.gradle index 62016dfc..2aad160d 100644 --- 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-jni-natives.jar') + compile files('vtm-natives-desktop.jar') } run { ignoreExitValue = true } diff --git a/vtm-desktop/vtm-jni-natives.jar b/vtm-desktop/vtm-natives-desktop.jar similarity index 100% rename from vtm-desktop/vtm-jni-natives.jar rename to vtm-desktop/vtm-natives-desktop.jar diff --git a/vtm-playground/build.gradle b/vtm-playground/build.gradle index 2927dccb..a99a0961 100644 --- 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-desktop/vtm-jni-natives.jar")) + from(zipTree("../vtm-desktop/vtm-natives-desktop.jar")) into("${buildDir}/assets") }