changed build system for Android from Ant to Gradle

[rocksndiamonds.git] / Makefile

diff --git a/Makefile b/Makefile
index 8921819891e9c82403ee3783ffa9532df6ca810b..308f0c9523513a0b9ea7f5c36569b6b28e9a1863 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,33 +63,18 @@ MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR)
 all:
        @$(MAKE_CMD)
 
-sdl:
-       @$(MAKE_CMD) TARGET=sdl
-
-sdl2:
-       @$(MAKE_CMD) TARGET=sdl2
-
-mac:
-       @$(MAKE_CMD) PLATFORM=macosx
-
 cross-win32:
        @PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
 
 cross-win64:
        @PATH=$(CROSS_PATH_WIN64)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win64
 
-android-compile:
-       @$(MAKE_CMD_ANDROID) compile
+android-prepare:
+       @$(MAKE_CMD_ANDROID) prepare
 
 android-package:
        @$(MAKE_CMD_ANDROID) package
 
-android-install:
-       @$(MAKE_CMD_ANDROID) install
-
-android-assets-toc:
-       @$(MAKE_CMD_ANDROID) assets-toc
-
 android-clean:
        @$(MAKE_CMD_ANDROID) clean
 
@@ -114,6 +99,9 @@ MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
 auto-conf:
        @$(MAKE_CMD) auto-conf
 
+conf-time:
+       @$(MAKE_CMD) conf-time
+
 run: all
        @$(MAKE_CMD) run