projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed movement-based engine snapshots when playing tapes
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index e24743a52444abb6240e57463f5219b3f79966b9..d5a21886056fd8d7d6048bd14295a3ea87866427 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-2014 by Artsoft Entertainment
+# Holger Schemel
+# info@artsoft.org
+# http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# Makefile
# =============================================================================
# -----------------------------------------------------------------------------
# =============================================================================
# -----------------------------------------------------------------------------
@@
-16,9
+21,6
@@
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
@@
-41,8
+43,7
@@
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
-# paths for cross-compiling (only needed for non-native MS-DOS and Win32 build)
-CROSS_PATH_MSDOS = /usr/local/cross-msdos/i386-msdosdjgpp
+# 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
CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
# compile special edition of R'n'D instead of the normal (classic) version
@@
-58,19
+59,13
@@
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 = sdl2
-
# -----------------------------------------------------------------------------
# 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
@@
-78,26
+73,11
@@
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-static:
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
+ @$(MAKE_CMD) PLATFORM=macosx STATIC=true
cross-win32:
@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
cross-win32:
@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
@@
-105,6
+85,9
@@
cross-win32:
clean:
@$(MAKE_CMD) clean
clean:
@$(MAKE_CMD) clean
+clean-git:
+ @$(MAKE_CMD) clean-git
+
# -----------------------------------------------------------------------------
# development, test, distribution build and packaging targets
# -----------------------------------------------------------------------------
# development, test, distribution build and packaging targets
@@
-169,9
+152,6
@@
dist-clean:
dist-build-unix:
@BUILD_DIST=TRUE $(MAKE)
dist-build-unix:
@BUILD_DIST=TRUE $(MAKE)
-dist-build-msdos:
- @BUILD_DIST=TRUE $(MAKE) cross-msdos
-
dist-build-win32:
@BUILD_DIST=TRUE $(MAKE) cross-win32
dist-build-win32:
@BUILD_DIST=TRUE $(MAKE) cross-win32
@@
-184,9
+164,6
@@
dist-build-macosx-ppc:
dist-package-unix:
./Scripts/make_dist.sh unix .
dist-package-unix:
./Scripts/make_dist.sh unix .
-dist-package-msdos:
- ./Scripts/make_dist.sh dos .
-
dist-package-win32:
./Scripts/make_dist.sh win .
dist-package-win32:
./Scripts/make_dist.sh win .
@@
-199,9
+176,6
@@
dist-package-macosx-ppc:
dist-upload-unix:
./Scripts/make_dist.sh unix . upload
dist-upload-unix:
./Scripts/make_dist.sh unix . upload
-dist-upload-msdos:
- ./Scripts/make_dist.sh dos . upload
-
dist-upload-win32:
./Scripts/make_dist.sh win . upload
dist-upload-win32:
./Scripts/make_dist.sh win . upload
@@
-215,21
+189,18
@@
dist-build-all:
$(MAKE) clean
$(MAKE) dist-build-unix ; $(MAKE) dist-clean
$(MAKE) dist-build-win32 ; $(MAKE) dist-clean
$(MAKE) clean
$(MAKE) dist-build-unix ; $(MAKE) dist-clean
$(MAKE) dist-build-win32 ; $(MAKE) dist-clean
-# $(MAKE) dist-build-msdos ; $(MAKE) dist-clean
dist-package-all:
$(MAKE) dist-package-unix
$(MAKE) dist-package-win32
$(MAKE) dist-package-macosx
$(MAKE) dist-package-macosx-ppc
dist-package-all:
$(MAKE) dist-package-unix
$(MAKE) dist-package-win32
$(MAKE) dist-package-macosx
$(MAKE) dist-package-macosx-ppc
-# $(MAKE) dist-package-msdos
dist-upload-all:
$(MAKE) dist-upload-unix
$(MAKE) dist-upload-win32
$(MAKE) dist-upload-macosx
$(MAKE) dist-upload-macosx-ppc
dist-upload-all:
$(MAKE) dist-upload-unix
$(MAKE) dist-upload-win32
$(MAKE) dist-upload-macosx
$(MAKE) dist-upload-macosx-ppc
-# $(MAKE) dist-upload-msdos
dist-all: dist-build-all dist-package-all
dist-all: dist-build-all dist-package-all
@@
-239,4
+210,4
@@
tags:
$(MAKE_CMD) tags
depend dep:
$(MAKE_CMD) tags
depend dep:
- $(MAKE_CMD)
TARGET=$(DEFAULT_TARGET)
depend
+ $(MAKE_CMD) depend