X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=68745a5d615e1e4bdab3a2ddabb27d43e3ffdcbc;hp=a30bf9cecac5f060ef5192fdd99e8f35f4b52a6c;hb=b275388df382d188bdce63b9e68783cb7139fc11;hpb=b80c9b0941d4e06e9de27e8cf81d45c2f3752714 diff --git a/Makefile b/Makefile index a30bf9ce..68745a5d 100644 --- a/Makefile +++ b/Makefile @@ -22,27 +22,22 @@ CC = gcc MAKE = make # directory for read-only game data (like graphics, sounds, levels) +# (this directory is usually the game's installation directory) # default is '.' to be able to run program without installation -# RO_GAME_DIR = /usr/games +# RO_GAME_DIR = . # use the following setting for Debian / Ubuntu installations: # RO_GAME_DIR = /usr/share/games/rocksndiamonds # directory for writable game data (like highscore files) +# (if no "scores" directory exists, scores are saved in user data directory) # default is '.' to be able to run program without installation -# RW_GAME_DIR = /var/games +# RW_GAME_DIR = . # use the following setting for Debian / Ubuntu installations: # RW_GAME_DIR = /var/games/rocksndiamonds # uncomment if system has no joystick include file # JOYSTICK = -DNO_JOYSTICK -# choose if more than one global score file entry for one player is allowed -# (default: MANY_PER_NAME) -# uncomment to install game in multi-user environment -# SCORE_ENTRIES = ONE_PER_NAME -# uncomment to install game in single-user environment (default) -# SCORE_ENTRIES = MANY_PER_NAME - # path for cross-compiling (only needed for non-native Windows build) CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc @@ -54,7 +49,10 @@ CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc .EXPORT_ALL_VARIABLES: SRC_DIR = src +ANDROID_DIR ?= android + MAKE_CMD = $(MAKE) -C $(SRC_DIR) +MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR) # ----------------------------------------------------------------------------- @@ -76,17 +74,39 @@ mac: cross-win32: @PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32 +android-compile: + @$(MAKE_CMD_ANDROID) compile + +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 + +android: android-package + clean: @$(MAKE_CMD) clean clean-git: @$(MAKE_CMD) clean-git +clean-android: android-clean + # ----------------------------------------------------------------------------- -# development, test, distribution build and packaging targets +# development targets # ----------------------------------------------------------------------------- +MAKE_ENGINETEST = ./Scripts/make_enginetest.sh +MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh + auto-conf: @$(MAKE_CMD) auto-conf @@ -99,44 +119,43 @@ gdb: all valgrind: all @$(MAKE_CMD) valgrind +tags: + $(MAKE_CMD) tags + +depend dep: + $(MAKE_CMD) depend + enginetest: all - ./Scripts/make_enginetest.sh + $(MAKE_ENGINETEST) enginetestcustom: all - ./Scripts/make_enginetest.sh custom + $(MAKE_ENGINETEST) custom enginetestfast: all - ./Scripts/make_enginetest.sh fast + $(MAKE_ENGINETEST) fast enginetestnew: all - ./Scripts/make_enginetest.sh new + $(MAKE_ENGINETEST) new leveltest: all - ./Scripts/make_enginetest.sh leveltest + $(MAKE_ENGINETEST) leveltest levelsketch_images: all - ./Scripts/make_levelsketch_images.sh - -backup: - ./Scripts/make_backup.sh src tar - -backup-net-copy: - ./Scripts/make_backup.sh src scp + $(MAKE_LEVELSKETCH) -backup-all: backup backup-net-copy -backup_lev: - ./Scripts/make_backup.sh lev - -backup_gfx: - ./Scripts/make_backup.sh gfx +# ----------------------------------------------------------------------------- +# distribution targets +# ----------------------------------------------------------------------------- -# prerelease: -# ./Scripts/make_prerelease.sh +MAKE_DIST = ./Scripts/make_dist.sh dist-clean: @$(MAKE_CMD) dist-clean +dist-clean-android: + @$(MAKE_CMD_ANDROID) dist-clean + dist-build-unix: @BUILD_DIST=TRUE $(MAKE) @@ -144,58 +163,71 @@ dist-build-win32: @BUILD_DIST=TRUE $(MAKE) cross-win32 dist-build-macosx: -# (this is done by "dist-package-macosx" target) + @BUILD_DIST=TRUE $(MAKE) -dist-build-macosx-ppc: -# (this is done by "dist-package-macosx-ppc" target) +dist-build-android: + @BUILD_DIST=TRUE $(MAKE) android dist-package-unix: - ./Scripts/make_dist.sh unix . + $(MAKE_DIST) package unix dist-package-win32: - ./Scripts/make_dist.sh win . + $(MAKE_DIST) package win dist-package-macosx: - ./Scripts/make_dist.sh mac . $(MAKE) + $(MAKE_DIST) package mac + +dist-package-android: + $(MAKE_DIST) package android + +dist-copy-package-unix: + $(MAKE_DIST) copy-package unix + +dist-copy-package-win32: + $(MAKE_DIST) copy-package win + +dist-copy-package-macosx: + $(MAKE_DIST) copy-package mac -dist-package-macosx-ppc: - ./Scripts/make_dist.sh mac-ppc . $(MAKE) +dist-copy-package-android: + $(MAKE_DIST) copy-package android dist-upload-unix: - ./Scripts/make_dist.sh unix . upload + $(MAKE_DIST) upload unix dist-upload-win32: - ./Scripts/make_dist.sh win . upload + $(MAKE_DIST) upload win dist-upload-macosx: - ./Scripts/make_dist.sh mac . upload + $(MAKE_DIST) upload mac -dist-upload-macosx-ppc: - ./Scripts/make_dist.sh mac-ppc . upload - -dist-build-all: - $(MAKE) clean - $(MAKE) dist-build-unix ; $(MAKE) dist-clean - $(MAKE) dist-build-win32 ; $(MAKE) dist-clean +dist-upload-android: + $(MAKE_DIST) upload android dist-package-all: $(MAKE) dist-package-unix $(MAKE) dist-package-win32 $(MAKE) dist-package-macosx - $(MAKE) dist-package-macosx-ppc + $(MAKE) dist-package-android + +dist-copy-package-all: + $(MAKE) dist-copy-package-unix + $(MAKE) dist-copy-package-win32 + $(MAKE) dist-copy-package-macosx + $(MAKE) dist-copy-package-android dist-upload-all: $(MAKE) dist-upload-unix $(MAKE) dist-upload-win32 $(MAKE) dist-upload-macosx - $(MAKE) dist-upload-macosx-ppc + $(MAKE) dist-upload-android -dist-all: dist-build-all dist-package-all +dist-release-all: dist-package-all dist-copy-package-all dist-upload-all -upload-all: dist-upload-all +package-all: dist-package-all -tags: - $(MAKE_CMD) tags +copy-package-all: dist-copy-package-all -depend dep: - $(MAKE_CMD) depend +upload-all: dist-upload-all + +release-all: dist-release-all