fixed bug with player moving when releasing one of several pressed snap keys
[rocksndiamonds.git] / Makefile
index f047a8076d112e84c3d14e78602378e931ae8f71..68745a5d615e1e4bdab3a2ddabb27d43e3ffdcbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,12 @@
 # =============================================================================
-# Rocks'n'Diamonds Makefile
+# Rocks'n'Diamonds - McDuffin Strikes Back!
 # -----------------------------------------------------------------------------
-# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# (c) 1995-2015 by Artsoft Entertainment
+#                  Holger Schemel
+#                  info@artsoft.org
+#                  http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# Makefile
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -16,30 +21,26 @@ CC = gcc
 # (this must be set to "gmake" for some systems)
 MAKE = make
 
-# path to X11 on your system
-X11_PATH = /usr/X11R6
-
 # 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
 
-# paths for cross-compiling (only needed for non-native MS-DOS and Win32 build)
-CROSS_PATH_MSDOS=/usr/local/cross-msdos/i386-msdosdjgpp
-CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 
 # -----------------------------------------------------------------------------
 # there should be no need to change anything below
@@ -48,10 +49,10 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 .EXPORT_ALL_VARIABLES:
 
 SRC_DIR = src
-MAKE_CMD = $(MAKE) -C $(SRC_DIR)
+ANDROID_DIR ?= android
 
-DEFAULT_TARGET = x11
-# DEFAULT_TARGET = sdl
+MAKE_CMD = $(MAKE) -C $(SRC_DIR)
+MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR)
 
 
 # -----------------------------------------------------------------------------
@@ -59,112 +60,174 @@ DEFAULT_TARGET = x11
 # -----------------------------------------------------------------------------
 
 all:
-       @$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
-
-x11:
-       @$(MAKE_CMD) TARGET=x11
+       @$(MAKE_CMD)
 
 sdl:
        @$(MAKE_CMD) TARGET=sdl
 
-solaris:
-       @$(MAKE_CMD) PLATFORM=solaris TARGET=x11
-
-solaris-sdl:
-       @$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
+sdl2:
+       @$(MAKE_CMD) TARGET=sdl2
 
 mac:
        @$(MAKE_CMD) PLATFORM=macosx
 
-msdos:
-       @$(MAKE_CMD) PLATFORM=msdos
-
-cross-msdos:
-       @PATH=$(CROSS_PATH_MSDOS)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-msdos
-
 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 only
+# development targets
 # -----------------------------------------------------------------------------
 
+MAKE_ENGINETEST = ./Scripts/make_enginetest.sh
+MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
+
 auto-conf:
        @$(MAKE_CMD) auto-conf
 
-run:
-       @$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && ./rocksndiamonds --verbose
+run: all
+       @$(MAKE_CMD) run
 
-gdb:
-       @$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && gdb ./rocksndiamonds
+gdb: all
+       @$(MAKE_CMD) gdb
 
-valgrind:
-       valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
+valgrind: all
+       @$(MAKE_CMD) valgrind
 
-enginetest:
-       ./Scripts/make_enginetest.sh
+tags:
+       $(MAKE_CMD) tags
 
-enginetestfast:
-       ./Scripts/make_enginetest.sh fast
-
-backup:
-       ./Scripts/make_backup.sh src
-
-backup_lev:
-       ./Scripts/make_backup.sh lev
+depend dep:
+       $(MAKE_CMD) depend
 
-backup_gfx:
-       ./Scripts/make_backup.sh gfx
+enginetest: all
+       $(MAKE_ENGINETEST)
 
-dist-unix:
-       ./Scripts/make_dist.sh unix .
+enginetestcustom: all
+       $(MAKE_ENGINETEST) custom
 
-dist-msdos:
-       ./Scripts/make_dist.sh dos .
+enginetestfast: all
+       $(MAKE_ENGINETEST) fast
 
-dist-win32:
-       ./Scripts/make_dist.sh win .
+enginetestnew: all
+       $(MAKE_ENGINETEST) new
 
-dist-macosx:
-       ./Scripts/make_dist.sh mac . $(MAKE)
+leveltest: all
+       $(MAKE_ENGINETEST) leveltest
 
-upload-unix:
-       ./Scripts/make_dist.sh unix . upload
+levelsketch_images: all
+       $(MAKE_LEVELSKETCH)
 
-upload-msdos:
-       ./Scripts/make_dist.sh dos . upload
 
-upload-win32:
-       ./Scripts/make_dist.sh win . upload
+# -----------------------------------------------------------------------------
+# distribution targets
+# -----------------------------------------------------------------------------
 
-upload-macosx:
-       ./Scripts/make_dist.sh mac . upload
+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) x11
+       @BUILD_DIST=TRUE $(MAKE)
 
 dist-build-win32:
        @BUILD_DIST=TRUE $(MAKE) cross-win32
 
-dist-build-msdos:
-       @BUILD_DIST=TRUE $(MAKE) cross-msdos
+dist-build-macosx:
+       @BUILD_DIST=TRUE $(MAKE)
 
-dist-build-all:
-       $(MAKE) clean
-       $(MAKE) dist-build-unix         ; $(MAKE) dist-clean
-       $(MAKE) dist-build-win32        ; $(MAKE) dist-clean
-       $(MAKE) dist-build-msdos        ; $(MAKE) dist-clean
+dist-build-android:
+       @BUILD_DIST=TRUE $(MAKE) android
 
-dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
+dist-package-unix:
+       $(MAKE_DIST) package unix
 
-upload-all: upload-unix upload-msdos upload-win32 upload-macosx
+dist-package-win32:
+       $(MAKE_DIST) package win
 
-depend dep:
-       $(MAKE_CMD) depend
+dist-package-macosx:
+       $(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-copy-package-android:
+       $(MAKE_DIST) copy-package android
+
+dist-upload-unix:
+       $(MAKE_DIST) upload unix
+
+dist-upload-win32:
+       $(MAKE_DIST) upload win
+
+dist-upload-macosx:
+       $(MAKE_DIST) upload mac
+
+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-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-android
+
+dist-release-all: dist-package-all dist-copy-package-all dist-upload-all
+
+package-all: dist-package-all
+
+copy-package-all: dist-copy-package-all
+
+upload-all: dist-upload-all
+
+release-all: dist-release-all