projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed aborting program due to '-psn' parameter when launched via GUI on Mac
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index aae58256af7f11fa73a5fa51aee3da7409d918a8..a30bf9cecac5f060ef5192fdd99e8f35f4b52a6c 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
# =============================================================================
# -----------------------------------------------------------------------------
# =============================================================================
# -----------------------------------------------------------------------------
@@
-41,9
+46,6
@@
MAKE = make
# 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
@@
-54,15
+56,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 = sdl2
-
# -----------------------------------------------------------------------------
# build targets
# -----------------------------------------------------------------------------
all:
# -----------------------------------------------------------------------------
# build targets
# -----------------------------------------------------------------------------
all:
- @$(MAKE_CMD)
TARGET=$(DEFAULT_TARGET)
+ @$(MAKE_CMD)
sdl:
@$(MAKE_CMD) TARGET=sdl
sdl:
@$(MAKE_CMD) TARGET=sdl
@@
-73,21
+73,15
@@
sdl2:
mac:
@$(MAKE_CMD) PLATFORM=macosx
mac:
@$(MAKE_CMD) PLATFORM=macosx
-mac-static:
- @$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
-
-mac2-static:
- @$(MAKE_CMD) PLATFORM=macosx TARGET=sdl2-static
-
-os2:
- @$(MAKE_CMD) PLATFORM=os2
-
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, test, distribution build and packaging targets
# -----------------------------------------------------------------------------
# development, test, distribution build and packaging targets
@@
-140,12
+134,6
@@
backup_gfx:
# prerelease:
# ./Scripts/make_prerelease.sh
# prerelease:
# ./Scripts/make_prerelease.sh
-jue:
- @$(MAKE) SPECIAL_EDITION=rnd_jue all
-
-jue-win:
- @$(MAKE) SPECIAL_EDITION=rnd_jue cross-win32
-
dist-clean:
@$(MAKE_CMD) dist-clean
dist-clean:
@$(MAKE_CMD) dist-clean
@@
-210,4
+198,4
@@
tags:
$(MAKE_CMD) tags
depend dep:
$(MAKE_CMD) tags
depend dep:
- $(MAKE_CMD)
TARGET=$(DEFAULT_TARGET)
depend
+ $(MAKE_CMD) depend