3dphotoshoot

changeset 13:8cfe061ddd5f

find changesets by author, revision, files, or words in the commit message
fixed the assets directories in the android makefile
author John Tsiombikas <nuclear@member.fsf.org>
date Sun, 07 Jun 2015 02:29:10 +0300
parents abe7960e4a77
children 06dc8b9b4f89
files .hgignore android/Makefile
diffstat 2 files changed, 11 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/.hgignore	Sat Jun 06 21:31:52 2015 +0300
     1.2 +++ b/.hgignore	Sun Jun 07 02:29:10 2015 +0300
     1.3 @@ -7,6 +7,8 @@
     1.4  ^android/libs/
     1.5  ^android/res/
     1.6  ^android/gen/
     1.7 +^android/assets/
     1.8 +^data/
     1.9  \.properties$
    1.10  \.apk$
    1.11  ^android/proguard-project\.txt

     2.1 --- a/android/Makefile	Sat Jun 06 21:31:52 2015 +0300
     2.2 +++ b/android/Makefile	Sun Jun 07 02:29:10 2015 +0300
     2.3 @@ -37,14 +37,19 @@
     2.4  .PHONY: release
     2.5  release: $(apk-release)
     2.6  
     2.7 -$(apk-debug): $(lib) $(jsrc) AndroidManifest.xml res/data
     2.8 +$(apk-debug): $(lib) $(jsrc) AndroidManifest.xml assets/data assets/sdr
     2.9  	ant debug
    2.10  
    2.11 -$(apk-release): $(lib) $(jsrc) AndroidManifest.xml res/data
    2.12 +$(apk-release): $(lib) $(jsrc) AndroidManifest.xml assets/data assets/sdr
    2.13  	ant release
    2.14  
    2.15 -res/data:
    2.16 -	cd res && rm -f data && ln -s ../../data .
    2.17 +assets/data:
    2.18 +	mkdir -p assets
    2.19 +	cd assets && rm -f data && ln -s ../../data .
    2.20 +
    2.21 +assets/sdr:
    2.22 +	mkdir -p assets
    2.23 +	cd assets && rm -f sdr && ln -s ../../sdr .
    2.24  
    2.25  .PHONY: lib
    2.26  lib: $(lib)