copy assets, make androidstudio happy

This commit is contained in:
Hannes Janetzek 2014-02-08 07:28:02 +01:00
parent 1bda4d29e1
commit 46f8f7d22a
3 changed files with 23 additions and 6 deletions

6
.gitignore vendored
View File

@ -2,6 +2,7 @@
*/gen/* */gen/*
*/obj/* */obj/*
target/ target/
build/
*.o *.o
*.so *.so
*.jar *.jar
@ -12,6 +13,8 @@ target/
/vtm/jni/memcpy_wrap.c /vtm/jni/memcpy_wrap.c
/vtm/jni/poly2tri/ /vtm/jni/poly2tri/
/vtm/libs/ /vtm/libs/
/vtm-android-example/assets/
/vtm-gdx-desktop/assets/
/vtm-gdx-html/war/assets/ /vtm-gdx-html/war/assets/
/vtm-gdx-html/war/WEB-INF/ /vtm-gdx-html/war/WEB-INF/
/vtm-gdx-html/war/org.oscim.gdx.GwtDefinition/ /vtm-gdx-html/war/org.oscim.gdx.GwtDefinition/
@ -26,4 +29,5 @@ target/
/themes/ /themes/
/vtm/assets/themes/ /vtm/assets/themes/
.gradle .gradle
build/ .idea
*.iml

View File

@ -5,6 +5,14 @@ dependencies {
compile fileTree(dir: 'libs', include: '*.jar') compile fileTree(dir: 'libs', include: '*.jar')
} }
task copyAssets(type: Copy) {
from "$rootDir/vtm/assets"
into "assets"
include '**/*'
}
tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyAssets }
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '19.0.1' buildToolsVersion '19.0.1'
@ -17,7 +25,7 @@ android {
aidl.srcDirs = ['src', 'assets'] aidl.srcDirs = ['src', 'assets']
renderscript.srcDirs = ['src', 'assets'] renderscript.srcDirs = ['src', 'assets']
res.srcDirs = ['res'] res.srcDirs = ['res']
assets.srcDirs = ['../vtm/assets'] assets.srcDirs = ['assets']
} }
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')

View File

@ -5,13 +5,18 @@ project(':vtm-gdx-desktop') {
mainClassName = 'org.oscim.gdx.GdxMapApp' mainClassName = 'org.oscim.gdx.GdxMapApp'
task copyAssets(type: Copy) {
from "$rootDir/vtm/assets"
into "assets"
include '**/*'
}
tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyAssets }
sourceSets { sourceSets {
main.java.srcDirs = ['src'] main.java.srcDirs = ['src']
main.resources.srcDirs = ['src'] main.resources.srcDirs = ['src']
main.resources.srcDirs = ['assets']
main.resources.srcDirs = [
file('../vtm/assets').getAbsolutePath()
]
output.resourcesDir = 'assets' output.resourcesDir = 'assets'
} }