Merge pull request #47 from Longri/fix-iOS-native

Link to new native folder. Don't copy to build folder
This commit is contained in:
Emux 2016-07-04 20:34:40 +03:00 committed by GitHub
commit 53cafa2f3b
2 changed files with 1 additions and 9 deletions

View File

@ -38,11 +38,6 @@ dependencies {
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
} }
task copyLibs(type: Copy) {
from("natives")
into("${buildDir}/natives")
}
task copyVtmResources(type: Copy) { task copyVtmResources(type: Copy) {
from("../vtm/resources") from("../vtm/resources")
into("${buildDir}") into("${buildDir}")
@ -53,9 +48,6 @@ task copyVtmThemesResources(type: Copy) {
into("${buildDir}") into("${buildDir}")
} }
tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
compileTask -> compileTask.dependsOn copyLibs
}
tasks.withType(org.gradle.api.tasks.compile.JavaCompile) { tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
compileTask -> compileTask.dependsOn copyVtmResources compileTask -> compileTask.dependsOn copyVtmResources

View File

@ -33,7 +33,7 @@
<pattern>org.apache.harmony.security.provider.crypto.CryptoProvider</pattern> <pattern>org.apache.harmony.security.provider.crypto.CryptoProvider</pattern>
</forceLinkClasses> </forceLinkClasses>
<libs> <libs>
<lib>build/natives/libvtm-jni.a</lib> <lib>natives/libvtm-jni.a</lib>
</libs> </libs>
<frameworks> <frameworks>
<framework>UIKit</framework> <framework>UIKit</framework>