X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=f1f99be921fb9d12543e6d34c392e08e6e487a07;hp=365c417c9559aa538309bfad0422368697c2a363;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hpb=3a98ec2c06b0355364b5747da91af9f673e295ca

diff --git a/src/Makefile b/src/Makefile
index 365c417c..f1f99be9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,12 @@
 # =============================================================================
-# Rocks'n'Diamonds Makefile (src)
+# 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/
+# -----------------------------------------------------------------------------
+# src/Makefile
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -10,84 +15,42 @@
 
 .EXPORT_ALL_VARIABLES:
 
-ifndef PLATFORM				# unknown platform -- try auto detection
-ifdef COMSPEC
-PLATFORM = msdos
-else
+ifndef PLATFORM				# unknown platform -- default to Unix
 PLATFORM = unix
 endif
-endif
-
-ifdef X11_PATH				# path to X11 from top level Makefile
-XINC_PATH = $(X11_PATH)/include
-XLIB_PATH = $(X11_PATH)/lib
-X11_INCL = -I$(XINC_PATH)
-X11_LIBS = -L$(XLIB_PATH) -lX11
-endif
 
 AR = ar
 RANLIB = ranlib
 ETAGS = etags
 RM = rm -f
 
-BMP2ICO = bmp2ico
+CONVERT = convert
 WINDRES = windres
 
-PROGBASE = rocksndiamonds
-
-ifdef SPECIAL_EDITION			# create special edition
-PROGBASE = $(SPECIAL_EDITION)
-endif
+CONVERT_ICON_ARGS = -transparent black -background transparent
 
+PROGBASE = rocksndiamonds
 PROGNAME = ../$(PROGBASE)
 
+EDITION ?= default
+
 
 # -----------------------------------------------------------------------------
 # configuring platform
 # -----------------------------------------------------------------------------
 
-ifeq ($(PLATFORM),solaris)		# native compiling to Solaris
-EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
-PLATFORM = unix
-endif
-
-ifeq ($(PLATFORM),macosx)		# native compiling to Mac OS X
+ifeq ($(PLATFORM),macosx)		# compiling on Mac OS X
 EXTRA_LDFLAGS = -lstdc++
-PLATFORM = unix
-TARGET = sdl
+override PLATFORM = unix
 endif
 
-ifeq ($(PLATFORM),os2)			# native compiling to OS/2
-RANLIB = echo
-PROGNAME = ../$(PROGBASE).exe
-EXTRA_CFLAGS = -Zbin-files -D__ST_MT_ERRNO__ -Zmtd -fomit-frame-pointer
-EXTRA_LDFLAGS = -lsocket
-PLATFORM = unix
-TARGET = x11
-endif
-
-ifeq ($(PLATFORM),unix)			# native compiling to Unix (generic)
+ifeq ($(PLATFORM),unix)			# compiling on Unix/Linux (generic)
 PROFILING_FLAGS = -pg
 endif
 
 ifeq ($(PLATFORM),cross-win32)		# cross-compiling to Windows
 PROGNAME = ../$(PROGBASE).exe
 EXTRA_LDFLAGS = -lshfolder -lwsock32
-TARGET = sdl
-endif
-
-ifeq ($(PLATFORM),cross-msdos)		# cross-compiling to MS-DOS
-PROGBASE = rocks
-PROGNAME = ../$(PROGBASE).exe
-TARGET = allegro
-endif
-
-ifeq ($(PLATFORM),msdos)		# native compiling to MS-DOS
-PROGBASE = rocks
-PROGNAME = ../$(PROGBASE).exe
-SYS_CFLAGS = -DTARGET_X11
-SYS_LDFLAGS = -s -lalleg
-RM = del
 endif
 
 
@@ -95,26 +58,32 @@ endif
 # configuring target
 # -----------------------------------------------------------------------------
 
-ifeq ($(TARGET),x11)			# compiling for X11 target
-SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
-SYS_LDFLAGS = $(X11_LIBS)
+ifndef TARGET				# auto-detect compiling for SDL or SDL2
+  SDL_VERSION := $(shell sdl2-config --version 2> /dev/null)
+  ifdef SDL_VERSION
+    TARGET = sdl2
+  else
+    SDL_VERSION := $(shell sdl-config --version 2> /dev/null)
+    ifdef SDL_VERSION
+      TARGET = sdl
+    else
+      $(error SDL/SDL2 library not found)
+    endif
+  endif
 endif
 
+# $(info Using SDL version $(SDL_VERSION) [TARGET == $(TARGET)])
+
 ifeq ($(TARGET),sdl)			# compiling for SDL target
-SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
-ifeq ($(TARGET),sdl-static)		# compiling for SDL target (static)
-SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
-SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
-endif
-
-ifeq ($(TARGET),allegro)		# compiling for Allegro target
-SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
-SYS_LDFLAGS = -lalleg
+ifeq ($(TARGET),sdl2)			# compiling for SDL2 target
+SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
+SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl2-config --libs)
 endif
 
 
@@ -130,33 +99,24 @@ ifdef RW_GAME_DIR			# path to writable game data specified
 CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
 endif
 
-ifdef SCORE_ENTRIES			# number of score entries per player
-CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
-endif
+CONFIG = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR) $(JOYSTICK)
 
-ifdef SPECIAL_EDITION
-ifeq ($(SPECIAL_EDITION),rnd_jue)	# create special edition
-CONFIG_SPECIAL = -DCREATE_SPECIAL_EDITION -DCREATE_SPECIAL_EDITION_RND_JUE
-endif
-endif
-
-CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
-CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(CONFIG_SPECIAL)
-
-CONFIG = $(CONFIG_GAME) $(JOYSTICK)
 DEBUG = -DDEBUG -g
+
 # PROFILING = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
 # OPTIONS = $(DEBUG) -O3 -Wall			# only for debugging purposes
-OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
+# OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
+OPTIONS = $(DEBUG) -Wall -Wstrict-prototypes	# only for debugging purposes
 # OPTIONS = $(DEBUG) -Wall -ansi -pedantic	# only for debugging purposes
 # OPTIONS = -O3 -Wall -ansi -pedantic
 # OPTIONS = -O3 -Wall
 # OPTIONS = -O3
-# OPTIONS = -DSYSV -Ae			# may be needed for HP-UX
 
 ifdef BUILD_DIST			# distribution build
+SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) |	\
+		       sed -e "s%-rpath,[^ ]*%-rpath,'\$$ORIGIN/lib'%")
 OPTIONS = -O3 -Wall
 endif
 
@@ -178,7 +138,7 @@ SRCS =	main.c		\
 	editor.c	\
 	files.c		\
 	tape.c		\
-	cartoons.c	\
+	anim.c		\
 	network.c	\
 	netserv.c
 
@@ -196,7 +156,7 @@ OBJS =	main.o		\
 	editor.o	\
 	files.o		\
 	tape.o		\
-	cartoons.o	\
+	anim.o		\
 	network.o	\
 	netserv.o
 
@@ -218,9 +178,16 @@ CNFS =	conf_gfx.h	\
 	conf_var.c	\
 	conf_act.c
 
-CNFS_CMD = ../Scripts/create_element_defs.pl
+CNFS_CMD = ../build-scripts/create_element_defs.pl
 
 TIMESTAMP_FILE = conftime.h
+TIMESTAMP_FORMAT = %Y-%m-%d %H:%M
+
+# use SOURCE_DATE_EPOCH, or else last Git commit date, or else current date
+SOURCE_DATE_EPOCH ?= $(shell test -d ../.git && test `git ls-files -m | wc -l` -eq 0 && git show -s --format=%ct || date +%s)
+
+# get source date string from either GNU / Linux or BSD / Mac OS X style "date"
+SOURCE_DATE_STRING := $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(TIMESTAMP_FORMAT)"  2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(TIMESTAMP_FORMAT)" 2>/dev/null || date -u "+$(TIMESTAMP_FORMAT)")
 
 LIBGAME_DIR = libgame
 LIBGAME = $(LIBGAME_DIR)/libgame.a
@@ -228,28 +195,37 @@ LIBGAME = $(LIBGAME_DIR)/libgame.a
 GAME_EM_DIR = game_em
 GAME_EM = $(GAME_EM_DIR)/game_em.a
 
-RNDLIBS = $(LIBGAME) $(GAME_EM)
+GAME_SP_DIR = game_sp
+GAME_SP = $(GAME_SP_DIR)/game_sp.a
+
+GAME_MM_DIR = game_mm
+GAME_MM = $(GAME_MM_DIR)/game_mm.a
+
+RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP) $(GAME_MM)
+AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
 
 ICONBASE = windows_icon
+ICON_BASEPATH = ../Special/Icons/windows_icons
+
 ifeq ($(PLATFORM),cross-win32)
-ifdef SPECIAL_EDITION
-ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
-else
-ICONSUFFIX = 32x32
-endif
-ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
+ICON_PATH = $(ICON_BASEPATH)/$(EDITION)
 ICON = $(ICONBASE).o
 endif
 
+GRAPHICS_DIR = ../graphics
+
 
 # -----------------------------------------------------------------------------
 # build targets
 # -----------------------------------------------------------------------------
 
-all: libgame_dir game_em_dir $(PROGNAME)
+all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir game_mm_dir $(PROGNAME) graphics_dir
 
 $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
+ifdef BUILD_DIST
+	strip $(PROGNAME)
+endif
 
 libgame_dir:
 	@$(MAKE) -C $(LIBGAME_DIR)
@@ -261,39 +237,59 @@ game_em_dir:
 $(GAME_EM):
 	@$(MAKE) -C $(GAME_EM_DIR)
 
+game_sp_dir:
+	@$(MAKE) -C $(GAME_SP_DIR)
+$(GAME_SP):
+	@$(MAKE) -C $(GAME_SP_DIR)
+
+game_mm_dir:
+	@$(MAKE) -C $(GAME_MM_DIR)
+$(GAME_MM):
+	@$(MAKE) -C $(GAME_MM_DIR)
+
 auto-conf:
 	@for i in $(CNFS); do			\
 		echo "$(CNFS_CMD) $$i > $$i";	\
 		$(CNFS_CMD) $$i > $$i;		\
 	done
 
-conf_gfx.h: conf_gfx.c
+auto-conf-clean:
+	@for i in $(CNFS); do			\
+		echo "$(RM) $$i";		\
+		$(RM) $$i;			\
+	done
+
+conf_gfx.h: conf_gfx.c $(CNFS_CMD)
 	@$(MAKE) auto-conf
 
-conf_snd.h: conf_snd.c
+conf_snd.h: conf_snd.c $(CNFS_CMD)
 	@$(MAKE) auto-conf
 
-conf_mus.h: conf_mus.c
+conf_mus.h: conf_mus.c $(CNFS_CMD)
 	@$(MAKE) auto-conf
 
-$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM)
-	@date '+"%Y-%m-%d %H:%M"' \
-	| sed -e 's/^/#define COMPILE_DATE_STRING /' \
+$(TIMESTAMP_FILE): $(SRCS) $(RNDLIBS)
+	@echo '#define SOURCE_DATE_STRING "$(SOURCE_DATE_STRING)"' \
 	> $(TIMESTAMP_FILE)
 
 $(ICON):
-	$(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)
+#	$(CONVERT) $(ICON32X32) $(CONVERT_ICON_ARGS) $(ICONBASE).ico
+	$(CONVERT) $(ICON_PATH)/*.png $(CONVERT_ICON_ARGS) $(ICONBASE).ico
 	echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
 
 .c.o:
 	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
+graphics_dir:
+	@test -f $(GRAPHICS_DIR)/Makefile && $(MAKE) -C $(GRAPHICS_DIR) || true
+
 clean-obj:
 	$(MAKE) -C $(LIBGAME_DIR) clean
 	$(MAKE) -C $(GAME_EM_DIR) clean
+	$(MAKE) -C $(GAME_SP_DIR) clean
+	$(MAKE) -C $(GAME_MM_DIR) clean
 	$(RM) $(OBJS)
-	$(RM) $(LIBGAME)
-	$(RM) $(GAME_EM)
+	$(RM) $(RNDLIBS)
 
 clean-ico:
 	$(RM) $(ICONBASE).ico
@@ -305,18 +301,23 @@ clean-bin:
 
 clean: clean-obj clean-ico clean-bin
 
+clean-git: clean auto-conf-clean
+	@$(MAKE) -C $(GRAPHICS_DIR) clean
+
+dist-clean: clean-obj clean-ico
+
 
 # -----------------------------------------------------------------------------
 # run and test targets
 # -----------------------------------------------------------------------------
 
-run: all
+run:
 	cd .. && ./$(PROGBASE) --verbose
 
-gdb: all
+gdb:
 	cd .. && gdb -batch -x GDB_COMMANDS ./$(PROGBASE)
 
-valgrind: all
+valgrind:
 	cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out
 
 
@@ -324,14 +325,14 @@ valgrind: all
 # development only
 # -----------------------------------------------------------------------------
 
-dist-clean: clean-obj
-
 tags:
-	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch]
+	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch] $(GAME_MM_DIR)/*.[ch]
 
 depend:
 	$(MAKE) -C $(LIBGAME_DIR) depend
 	$(MAKE) -C $(GAME_EM_DIR) depend
+	$(MAKE) -C $(GAME_SP_DIR) depend
+	$(MAKE) -C $(GAME_MM_DIR) depend
 	for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 
 ifeq (.depend,$(wildcard .depend))