From 46f8f7d22a05608f950acda46bca76042cb51345 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sat, 8 Feb 2014 07:28:02 +0100
Subject: [PATCH] copy assets, make androidstudio happy
---
.gitignore | 6 +++++-
vtm-android-example/build.gradle | 10 +++++++++-
vtm-gdx-desktop/build.gradle | 13 +++++++++----
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5aa8ef76..83246265 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*/gen/*
*/obj/*
target/
+build/
*.o
*.so
*.jar
@@ -12,6 +13,8 @@ target/
/vtm/jni/memcpy_wrap.c
/vtm/jni/poly2tri/
/vtm/libs/
+/vtm-android-example/assets/
+/vtm-gdx-desktop/assets/
/vtm-gdx-html/war/assets/
/vtm-gdx-html/war/WEB-INF/
/vtm-gdx-html/war/org.oscim.gdx.GwtDefinition/
@@ -26,4 +29,5 @@ target/
/themes/
/vtm/assets/themes/
.gradle
-build/
+.idea
+*.iml
diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle
index 5185c193..20f86d98 100644
--- a/vtm-android-example/build.gradle
+++ b/vtm-android-example/build.gradle
@@ -5,6 +5,14 @@ dependencies {
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 {
compileSdkVersion 19
buildToolsVersion '19.0.1'
@@ -17,7 +25,7 @@ android {
aidl.srcDirs = ['src', 'assets']
renderscript.srcDirs = ['src', 'assets']
res.srcDirs = ['res']
- assets.srcDirs = ['../vtm/assets']
+ assets.srcDirs = ['assets']
}
debug.setRoot('build-types/debug')
diff --git a/vtm-gdx-desktop/build.gradle b/vtm-gdx-desktop/build.gradle
index 311a3168..c5318638 100644
--- a/vtm-gdx-desktop/build.gradle
+++ b/vtm-gdx-desktop/build.gradle
@@ -5,13 +5,18 @@ project(':vtm-gdx-desktop') {
mainClassName = 'org.oscim.gdx.GdxMapApp'
+ task copyAssets(type: Copy) {
+ from "$rootDir/vtm/assets"
+ into "assets"
+ include '**/*'
+ }
+
+ tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyAssets }
+
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['src']
-
- main.resources.srcDirs = [
- file('../vtm/assets').getAbsolutePath()
- ]
+ main.resources.srcDirs = ['assets']
output.resourcesDir = 'assets'
}