projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed compilation error for SDL 1.2 target
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index d80dcb5796b102b50930dcd7c94df92e05c664c1..68745a5d615e1e4bdab3a2ddabb27d43e3ffdcbc 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,12
@@
# =============================================================================
# =============================================================================
-# Rocks'n'Diamonds
Makefile
+# Rocks'n'Diamonds
- McDuffin Strikes Back!
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# (c) 1995-2013 Holger Schemel <info@artsoft.org>
+# (c) 1995-2015 by Artsoft Entertainment
+# Holger Schemel
+# info@artsoft.org
+# http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# Makefile
# =============================================================================
# -----------------------------------------------------------------------------
# =============================================================================
# -----------------------------------------------------------------------------
@@
-16,37
+21,26
@@
CC = gcc
# (this must be set to "gmake" for some systems)
MAKE = make
# (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)
# 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
# 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)
# 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
# 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
# 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
# path for cross-compiling (only needed for non-native Windows build)
CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
-# compile special edition of R'n'D instead of the normal (classic) version
-# SPECIAL_EDITION = rnd_jue
-
# -----------------------------------------------------------------------------
# there should be no need to change anything below
# -----------------------------------------------------------------------------
# there should be no need to change anything below
@@
-55,10
+49,10
@@
CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
.EXPORT_ALL_VARIABLES:
SRC_DIR = src
.EXPORT_ALL_VARIABLES:
SRC_DIR = src
-MAKE_CMD = $(MAKE) -C $(SRC_DIR)
+ANDROID_DIR ?= android
-# DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl2
+MAKE_CMD = $(MAKE) -C $(SRC_DIR)
+MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR)
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
@@
-66,10
+60,7
@@
DEFAULT_TARGET = sdl2
# -----------------------------------------------------------------------------
all:
# -----------------------------------------------------------------------------
all:
- @$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
-
-x11:
- @$(MAKE_CMD) TARGET=x11
+ @$(MAKE_CMD)
sdl:
@$(MAKE_CMD) TARGET=sdl
sdl:
@$(MAKE_CMD) TARGET=sdl
@@
-77,35
+68,45
@@
sdl:
sdl2:
@$(MAKE_CMD) TARGET=sdl2
sdl2:
@$(MAKE_CMD) TARGET=sdl2
-solaris:
- @$(MAKE_CMD) PLATFORM=solaris TARGET=x11
-
-solaris-sdl:
- @$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
-
mac:
@$(MAKE_CMD) PLATFORM=macosx
mac:
@$(MAKE_CMD) PLATFORM=macosx
-
mac-static
:
- @
$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
+
cross-win32
:
+ @
PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
-
mac2-static
:
- @$(MAKE_CMD
) PLATFORM=macosx TARGET=sdl2-static
+
android-compile
:
+ @$(MAKE_CMD
_ANDROID) compile
-
os2
:
- @$(MAKE_CMD
) PLATFORM=os2
+
android-package
:
+ @$(MAKE_CMD
_ANDROID) package
-cross-win32:
- @PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
+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:
@$(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
auto-conf:
@$(MAKE_CMD) auto-conf
@@
-118,50
+119,43
@@
gdb: all
valgrind: all
@$(MAKE_CMD) valgrind
valgrind: all
@$(MAKE_CMD) valgrind
+tags:
+ $(MAKE_CMD) tags
+
+depend dep:
+ $(MAKE_CMD) depend
+
enginetest: all
enginetest: all
- ./Scripts/make_enginetest.sh
+ $(MAKE_ENGINETEST)
enginetestcustom: all
enginetestcustom: all
-
./Scripts/make_enginetest.sh
custom
+
$(MAKE_ENGINETEST)
custom
enginetestfast: all
enginetestfast: all
-
./Scripts/make_enginetest.sh
fast
+
$(MAKE_ENGINETEST)
fast
enginetestnew: all
enginetestnew: all
-
./Scripts/make_enginetest.sh
new
+
$(MAKE_ENGINETEST)
new
leveltest: all
leveltest: all
-
./Scripts/make_enginetest.sh
leveltest
+
$(MAKE_ENGINETEST)
leveltest
levelsketch_images: all
levelsketch_images: all
- ./Scripts/make_levelsketch_images.sh
-
-backup:
- ./Scripts/make_backup.sh src tar
-
-backup-net-copy:
- ./Scripts/make_backup.sh src scp
-
-backup-all: backup backup-net-copy
-
-backup_lev:
- ./Scripts/make_backup.sh lev
-
-backup_gfx:
- ./Scripts/make_backup.sh gfx
+ $(MAKE_LEVELSKETCH)
-# prerelease:
-# ./Scripts/make_prerelease.sh
-jue:
- @$(MAKE) SPECIAL_EDITION=rnd_jue all
+# -----------------------------------------------------------------------------
+# distribution targets
+# -----------------------------------------------------------------------------
-jue-win:
- @$(MAKE) SPECIAL_EDITION=rnd_jue cross-win32
+MAKE_DIST = ./Scripts/make_dist.sh
dist-clean:
@$(MAKE_CMD) dist-clean
dist-clean:
@$(MAKE_CMD) dist-clean
+dist-clean-android:
+ @$(MAKE_CMD_ANDROID) dist-clean
+
dist-build-unix:
@BUILD_DIST=TRUE $(MAKE)
dist-build-unix:
@BUILD_DIST=TRUE $(MAKE)
@@
-169,58
+163,71
@@
dist-build-win32:
@BUILD_DIST=TRUE $(MAKE) cross-win32
dist-build-macosx:
@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:
dist-package-unix:
- ./Scripts/make_dist.sh unix .
+ $(MAKE_DIST) package unix
dist-package-win32:
dist-package-win32:
- ./Scripts/make_dist.sh win .
+ $(MAKE_DIST) package win
dist-package-macosx:
dist-package-macosx:
- ./Scripts/make_dist.sh mac . $(MAKE)
+ $(MAKE_DIST) package mac
+
+dist-package-android:
+ $(MAKE_DIST) package android
-dist-package-macosx-ppc:
- ./Scripts/make_dist.sh mac-ppc . $(MAKE)
+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:
dist-upload-unix:
- ./Scripts/make_dist.sh unix . upload
+ $(MAKE_DIST) upload unix
dist-upload-win32:
dist-upload-win32:
- ./Scripts/make_dist.sh win . upload
+ $(MAKE_DIST) upload win
dist-upload-macosx:
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
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
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) TARGET=$(DEFAULT_TARGET) depend
+upload-all: dist-upload-all
+
+release-all: dist-release-all