X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=build-projects%2Fandroid%2FMakefile;h=20bce5bf562e3762e9858163cee768f6c40e71b7;hp=0bf05df32ef22ed23f3c7a24c4f7a8437ce91859;hb=51d5e483a5d8b50e0c0956053e0e264c20382928;hpb=233a6e8536ef2ff2c799011417b9f55e1db54300

diff --git a/build-projects/android/Makefile b/build-projects/android/Makefile
index 0bf05df3..20bce5bf 100644
--- a/build-projects/android/Makefile
+++ b/build-projects/android/Makefile
@@ -1,56 +1,50 @@
-# -----------------------------------------------------------------------------
+# =============================================================================
 # Rocks'n'Diamonds for Android
 # -----------------------------------------------------------------------------
-
-# debugging C/ASM:
-# arm-linux-androideabi-objdump -S obj/local/armeabi-v7a/libmain.so
+# (c) 1995-2020 by Artsoft Entertainment
+#                  Holger Schemel
+#                  info@artsoft.org
+#                  http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# build-projects/android/Makefile
+# =============================================================================
 
 PROGBASE = rocksndiamonds
 
-ANDROID_SDK_PATH := ${HOME}/projects/Android/SDK/android-sdk
-ANDROID_NDK_PATH := ${HOME}/projects/Android/SDK/android-ndk
-
-SDK_TOOLS_PATH := ${ANDROID_SDK_PATH}/tools
-SDK_PLATFORM_TOOLS_PATH := ${ANDROID_SDK_PATH}/platform-tools
-NDK_PATH := ${ANDROID_NDK_PATH}
-
-PATH := ${PATH}:${SDK_TOOLS_PATH}:${SDK_PLATFORM_TOOLS_PATH}:${NDK_PATH}
+AUTO_GENERATED_BUILD_DIRS = .gradle app/.externalNativeBuild app/build
+AUTO_GENERATED_OTHER_DIRS = app/jni/SDL2* app/src/main/assets .prepared
 
-AUTO_GENERATED_DIRS = bin gen obj
+export ANDROID_HOME := $(HOME)/projects/Android/SDK
 
 
 all: package
 
+sdl:
+	./build-scripts/create_sdl.sh
+
 manifest:
 	./build-scripts/create_manifest.sh
 
-compile: manifest
-	ndk-build NDK_DEBUG=1
+assets:
+	./build-scripts/create_assets.sh
 
-verbose: manifest
-	ndk-build V=1
+assets-toc:
+	./build-scripts/create_asset_tocs.sh app/src/main/assets
 
-package: compile
-	ANDROID_AAPT_IGNORE="__IGNORE_NOTHING__" ant debug
+.prepared: sdl manifest assets assets-toc
+	make -C ../.. auto-conf conf-time
 
-install: package
-	adb install -r bin/$(PROGBASE)-debug.apk
+prepare: .prepared
 
-ant-init:
-	android update project --name $(PROGBASE) --path .
-
-assets-toc:
-	./build-scripts/create_asset_tocs.sh assets
+package: prepare
+	./gradlew assembleDebug
 
 clean-build:
-	ndk-build clean
+	./gradlew clean
 
 clean-auto-generated:
-	rm -rf $(AUTO_GENERATED_DIRS)
-
-clean: clean-build clean-auto-generated
+	rm -rf $(AUTO_GENERATED_BUILD_DIRS) $(AUTO_GENERATED_OTHER_DIRS)
 
-dist-clean: clean
+clean: clean-build
 
-coredump:
-	adb logcat -d | ndk-stack -sym obj/local/armeabi-v7a
+dist-clean: clean-build clean-auto-generated