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

This commit is contained in:
Emux 2016-06-17 21:47:36 +03:00
parent e85ec48468
commit 3ea5af2477
9 changed files with 6 additions and 7 deletions

1
.gitignore vendored
View File

@ -5,7 +5,6 @@ target/
build/ build/
*.o *.o
*.so *.so
*.jar
*.class *.class
/vtm-web/war/ /vtm-web/war/
/vtm-web/assets/ /vtm-web/assets/

View File

@ -10,7 +10,7 @@ dependencies {
compile project(':vtm-jeo') compile project(':vtm-jeo')
compile project(':vtm-extras') compile project(':vtm-extras')
compile project(':vtm-themes') 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:support-v4:22.+'
compile 'com.android.support:appcompat-v7:22.+' compile 'com.android.support:appcompat-v7:22.+'

View File

@ -10,7 +10,7 @@ dependencies {
//compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi" //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-armeabi-v7a"
compile files("${rootDir}/vtm-ext-libs/gdx/gdx-native-libs.jar") 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) { //task copyLibs(type: Copy) {

View File

@ -8,7 +8,7 @@ configurations {
dependencies { dependencies {
compile project(':vtm-android') compile project(':vtm-android')
compile project(':vtm-themes') 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:support-v4:22.+'
compile 'com.android.support:appcompat-v7:22.+' compile 'com.android.support:appcompat-v7:22.+'

View File

@ -7,7 +7,7 @@ configurations {
dependencies { dependencies {
compile project(':vtm') 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.+' compile 'com.android.support:support-v4:21.+'
eclipseCompile project(':appcompat') eclipseCompile project(':appcompat')

Binary file not shown.

View File

@ -34,7 +34,7 @@ dependencies {
compile "com.badlogicgames.gdx:gdx-backend-jglfw:$gdxVersion" compile "com.badlogicgames.gdx:gdx-backend-jglfw:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile 'org.slf4j:slf4j-simple:1.7.6' 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 } run { ignoreExitValue = true }

Binary file not shown.

View File

@ -10,7 +10,7 @@ mainClassName = 'org.oscim.gdx.GdxMapApp'
// package vtm native libs into jar // package vtm native libs into jar
task copyLibs(type: Copy) { 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") into("${buildDir}/assets")
} }