# HG changeset patch # User John Tsiombikas # Date 1433633350 -10800 # Node ID 8cfe061ddd5fbd56f48a6fb041cd3729be11263b # Parent abe7960e4a77a39db5b9a9aed8d502da20469b95 fixed the assets directories in the android makefile diff -r abe7960e4a77 -r 8cfe061ddd5f .hgignore --- a/.hgignore Sat Jun 06 21:31:52 2015 +0300 +++ b/.hgignore Sun Jun 07 02:29:10 2015 +0300 @@ -7,6 +7,8 @@ ^android/libs/ ^android/res/ ^android/gen/ +^android/assets/ +^data/ \.properties$ \.apk$ ^android/proguard-project\.txt diff -r abe7960e4a77 -r 8cfe061ddd5f android/Makefile --- a/android/Makefile Sat Jun 06 21:31:52 2015 +0300 +++ b/android/Makefile Sun Jun 07 02:29:10 2015 +0300 @@ -37,14 +37,19 @@ .PHONY: release release: $(apk-release) -$(apk-debug): $(lib) $(jsrc) AndroidManifest.xml res/data +$(apk-debug): $(lib) $(jsrc) AndroidManifest.xml assets/data assets/sdr ant debug -$(apk-release): $(lib) $(jsrc) AndroidManifest.xml res/data +$(apk-release): $(lib) $(jsrc) AndroidManifest.xml assets/data assets/sdr ant release -res/data: - cd res && rm -f data && ln -s ../../data . +assets/data: + mkdir -p assets + cd assets && rm -f data && ln -s ../../data . + +assets/sdr: + mkdir -p assets + cd assets && rm -f sdr && ln -s ../../sdr . .PHONY: lib lib: $(lib)