X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=308f0c9523513a0b9ea7f5c36569b6b28e9a1863;hp=8921819891e9c82403ee3783ffa9532df6ca810b;hb=51d5e483a5d8b50e0c0956053e0e264c20382928;hpb=79d9ea719f6a44c452f394600c6076063d4c73de diff --git a/Makefile b/Makefile index 89218198..308f0c95 100644 --- 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