projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed variable
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 7e91482df7e3f66286206c7a806fe3c110068e56..41840b0cb6e2734dd816b2dd57051631069f5bfa 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,12
@@
# =============================================================================
# =============================================================================
-# Rocks'n'Diamonds
Makefile
+# Rocks'n'Diamonds
- McDuffin Strikes Back!
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# (c) 1995-2006 Holger Schemel <info@artsoft.org>
+# (c) 1995-2015 by Artsoft Entertainment
+# Holger Schemel
+# info@artsoft.org
+# http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# Makefile
# =============================================================================
# -----------------------------------------------------------------------------
# =============================================================================
# -----------------------------------------------------------------------------
@@
-16,16
+21,17
@@
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)
# default is '.' to be able to run program without installation
# RO_GAME_DIR = /usr/games
# directory for read-only game data (like graphics, sounds, levels)
# default is '.' to be able to run program without installation
# RO_GAME_DIR = /usr/games
+# use the following setting for Debian / Ubuntu installations:
+# RO_GAME_DIR = /usr/share/games/rocksndiamonds
# directory for writable game data (like highscore files)
# default is '.' to be able to run program without installation
# RW_GAME_DIR = /var/games
# directory for writable game data (like highscore files)
# default is '.' to be able to run program without installation
# RW_GAME_DIR = /var/games
+# 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
# uncomment if system has no joystick include file
# JOYSTICK = -DNO_JOYSTICK
@@
-37,9
+43,9
@@
X11_PATH = /usr/X11R6
# uncomment to install game in single-user environment (default)
# SCORE_ENTRIES = MANY_PER_NAME
# uncomment to install game in single-user environment (default)
# SCORE_ENTRIES = MANY_PER_NAME
-# path
s 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
+# path
for cross-compiling (only needed for non-native Windows
build)
+CROSS_PATH_
WIN32 = /usr/local/cross-tools/i386-mingw32msvc
+
# -----------------------------------------------------------------------------
# there should be no need to change anything below
# -----------------------------------------------------------------------------
# there should be no need to change anything below
@@
-50,66
+56,48
@@
CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
SRC_DIR = src
MAKE_CMD = $(MAKE) -C $(SRC_DIR)
SRC_DIR = src
MAKE_CMD = $(MAKE) -C $(SRC_DIR)
-# DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl
-
# -----------------------------------------------------------------------------
# build targets
# -----------------------------------------------------------------------------
all:
# -----------------------------------------------------------------------------
# build targets
# -----------------------------------------------------------------------------
all:
- @$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
-
-x11:
- @$(MAKE_CMD) TARGET=x11
+ @$(MAKE_CMD)
sdl:
@$(MAKE_CMD) TARGET=sdl
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
mac:
@$(MAKE_CMD) PLATFORM=macosx
-mac-static:
- @$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
-
-msdos:
- @$(MAKE_CMD) PLATFORM=msdos
-
-os2:
- @$(MAKE_CMD) PLATFORM=os2
-
-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
clean:
@$(MAKE_CMD) clean
cross-win32:
@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
clean:
@$(MAKE_CMD) clean
+clean-git:
+ @$(MAKE_CMD) clean-git
+
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# development
only
+# development
, test, distribution build and packaging targets
# -----------------------------------------------------------------------------
auto-conf:
@$(MAKE_CMD) auto-conf
run: all
# -----------------------------------------------------------------------------
auto-conf:
@$(MAKE_CMD) auto-conf
run: all
- @
./rocksndiamonds --verbose
+ @
$(MAKE_CMD) run
gdb: all
gdb: all
- @
gdb -batch -x GDB_COMMANDS ./rocksndiamonds
+ @
$(MAKE_CMD) gdb
valgrind: all
valgrind: all
- @
valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
+ @
$(MAKE_CMD) valgrind
enginetest: all
./Scripts/make_enginetest.sh
enginetest: all
./Scripts/make_enginetest.sh
@@
-126,71
+114,52
@@
enginetestnew: all
leveltest: all
./Scripts/make_enginetest.sh leveltest
leveltest: all
./Scripts/make_enginetest.sh leveltest
-backup:
- ./Scripts/make_backup.sh src 1
-
-backup2:
- ./Scripts/make_backup.sh src 2
-
-backup3:
- ./Scripts/make_backup.sh src 3
-
-backup_lev:
- ./Scripts/make_backup.sh lev
+levelsketch_images: all
+ ./Scripts/make_levelsketch_images.sh
-backup_gfx:
- ./Scripts/make_backup.sh gfx
-
-# prerelease:
-# ./Scripts/make_prerelease.sh
-
-dist-unix:
- ./Scripts/make_dist.sh unix .
-
-dist-msdos:
- ./Scripts/make_dist.sh dos .
+dist-clean:
+ @$(MAKE_CMD) dist-clean
-dist-
win32
:
- ./Scripts/make_dist.sh win .
+dist-
build-unix
:
+ @BUILD_DIST=TRUE $(MAKE)
-dist-
macosx
:
- ./Scripts/make_dist.sh mac . $(MAKE)
+dist-
build-win32
:
+ @BUILD_DIST=TRUE $(MAKE) cross-win32
-
upload-uni
x:
- ./Scripts/make_dist.sh unix . upload
+
dist-build-macos
x:
+ @BUILD_DIST=TRUE $(MAKE)
-
upload-msdos
:
- ./Scripts/make_dist.sh
dos . upload
+
dist-package-unix
:
+ ./Scripts/make_dist.sh
package unix
-
upload
-win32:
- ./Scripts/make_dist.sh
win . upload
+
dist-package
-win32:
+ ./Scripts/make_dist.sh
package win
-
upload
-macosx:
- ./Scripts/make_dist.sh
mac . upload
+
dist-package
-macosx:
+ ./Scripts/make_dist.sh
package mac
-dist-
clean
:
- @$(MAKE_CMD) dist-clean
+dist-
upload-unix
:
+ ./Scripts/make_dist.sh upload unix
-dist-
build-unix
:
- @BUILD_DIST=TRUE $(MAKE) x11
+dist-
upload-win32
:
+ ./Scripts/make_dist.sh upload win
-dist-
build-win32
:
- @BUILD_DIST=TRUE $(MAKE) cross-win32
+dist-
upload-macosx
:
+ ./Scripts/make_dist.sh upload mac
-dist-build-msdos:
- @BUILD_DIST=TRUE $(MAKE) cross-msdos
+dist-package-all:
+ $(MAKE) dist-package-unix
+ $(MAKE) dist-package-win32
+ $(MAKE) dist-package-macosx
-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-upload-all:
+ $(MAKE) dist-upload-unix
+ $(MAKE) dist-upload-win32
+ $(MAKE) dist-upload-macosx
-# dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
-dist-all: dist-build-all dist-unix dist-win32 dist-macosx
+package-all: dist-package-all
-# upload-all: upload-unix upload-msdos upload-win32 upload-macosx
-upload-all: upload-unix upload-win32 upload-macosx
+upload-all: dist-upload-all
tags:
$(MAKE_CMD) tags
tags:
$(MAKE_CMD) tags