X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=bacc168d1e95b9b1f6b1a864646e17eb7c9c4b96;hp=dd6896bf53b9e7fee6491fe1431495fd3a87f080;hb=b85bbf90337a581a6de74005dca2385914ab7003;hpb=3607ef8e4000754063935d908053d564de92c0a2

diff --git a/src/Makefile b/src/Makefile
index dd6896bf..bacc168d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,12 @@
 # =============================================================================
-# Rocks'n'Diamonds Makefile (src)
+# Rocks'n'Diamonds - McDuffin Strikes Back!
 # -----------------------------------------------------------------------------
-# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# (c) 1995-2015 by Artsoft Entertainment
+#                  Holger Schemel
+#                  info@artsoft.org
+#                  http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# src/Makefile
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -10,109 +15,92 @@
 
 .EXPORT_ALL_VARIABLES:
 
-ifndef PLATFORM			# no platform specified -- 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 specified by top level Makefile
-XINC_PATH = $(X11_PATH)/include
-XLIB_PATH = $(X11_PATH)/lib
-X11_INCL = -I$(XINC_PATH)
-X11_LIBS = -L$(XLIB_PATH)
-endif
 
 AR = ar
 RANLIB = ranlib
+ETAGS = etags
+RM = rm -f
 
-BMP2ICO = bmp2ico
+CONVERT = convert
 WINDRES = windres
 
-ifeq ($(PLATFORM),msdos)	# MS-DOS native compiling
-
-RM = del
-
-PROGBASE = rocks
-PROGNAME = ../$(PROGBASE).exe
-
-SYS_CFLAGS = -DTARGET_X11
-SYS_LDFLAGS = -s -lalleg
-
-else				# Unix or cross-compiling for MS-DOS and Win32
-
-RM = rm -f
+CONVERT_ICON_ARGS = -transparent black -background transparent
 
 PROGBASE = rocksndiamonds
 PROGNAME = ../$(PROGBASE)
 
-ifeq ($(PLATFORM),solaris)
-EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
-PLATFORM = unix
-endif
 
-ifeq ($(PLATFORM),macosx)
-PLATFORM = unix
-TARGET=sdl
+# -----------------------------------------------------------------------------
+# configuring platform
+# -----------------------------------------------------------------------------
+
+ifeq ($(PLATFORM),macosx)		# compiling on Mac OS X
+EXTRA_LDFLAGS = -lstdc++
+override PLATFORM = unix
 endif
 
-ifeq ($(PLATFORM),unix)
+ifeq ($(PLATFORM),unix)			# compiling on Unix/Linux (generic)
 PROFILING_FLAGS = -pg
 endif
 
-ifeq ($(PLATFORM),cross-msdos)
-PROGBASE = rocks
+ifeq ($(PLATFORM),cross-win32)		# cross-compiling to Windows
 PROGNAME = ../$(PROGBASE).exe
-TARGET = allegro
+EXTRA_LDFLAGS = -lshfolder -lwsock32
 endif
 
-ifeq ($(PLATFORM),cross-win32)
-EXTRA_LDFLAGS = -lshfolder
-PROGNAME = ../$(PROGBASE).exe
-TARGET = sdl
-endif
 
-ifeq ($(TARGET),x11)
-SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
-SYS_LDFLAGS = $(X11_LIBS) -lX11
-endif
+# -----------------------------------------------------------------------------
+# configuring target
+# -----------------------------------------------------------------------------
 
-ifeq ($(TARGET),sdl)
-SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-ifeq ($(PLATFORM),macosx)
-SYS_LDFLAGS = -lSDL_image -lSDL_mixer -lsmpeg $(shell sdl-config --libs)
-else
-SYS_LDFLAGS = -lSDL_image -lSDL_mixer $(shell sdl-config --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
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
-ifeq ($(TARGET),allegro)
-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
 
-endif				# (PLATFORM != msdos)
 
+# -----------------------------------------------------------------------------
+# configuring compile-time definitions
+# -----------------------------------------------------------------------------
 
-ifdef RO_GAME_DIR		# path to read-only game data specified
+ifdef RO_GAME_DIR			# path to read-only game data specified
 CONFIG_RO_GAME_DIR = -DRO_GAME_DIR="\"$(RO_GAME_DIR)\""
 endif
 
-ifdef RW_GAME_DIR		# path to writable game data specified
+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 specified
-CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
-endif
-
-CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
+CONFIG = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR) $(JOYSTICK)
 
-
-CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
 DEBUG = -DDEBUG -g
+
 # PROFILING = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
@@ -122,20 +110,22 @@ OPTIONS = $(DEBUG) -Wall			# 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
+ifdef BUILD_DIST			# distribution build
+SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) |	\
+		       sed -e "s%-rpath,[^ ]*%-rpath,'\$$ORIGIN/lib'%")
 OPTIONS = -O3 -Wall
 endif
 
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
-LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
 
 
 SRCS =	main.c		\
 	conf_gfx.c	\
 	conf_snd.c	\
 	conf_mus.c	\
+	conf_hlp.c	\
 	init.c		\
 	config.c	\
 	events.c	\
@@ -145,7 +135,7 @@ SRCS =	main.c		\
 	editor.c	\
 	files.c		\
 	tape.c		\
-	cartoons.c	\
+	anim.c		\
 	network.c	\
 	netserv.c
 
@@ -153,6 +143,7 @@ OBJS =	main.o		\
 	conf_gfx.o	\
 	conf_snd.o	\
 	conf_mus.o	\
+	conf_hlp.o	\
 	init.o		\
 	config.o	\
 	events.o	\
@@ -162,7 +153,7 @@ OBJS =	main.o		\
 	editor.o	\
 	files.o		\
 	tape.o		\
-	cartoons.o	\
+	anim.o		\
 	network.o	\
 	netserv.o
 
@@ -173,38 +164,77 @@ CNFS =	conf_gfx.h	\
 	conf_chr.h	\
 	conf_cus.c	\
 	conf_cus.h	\
+	conf_grp.c	\
+	conf_grp.h	\
 	conf_e2g.c	\
 	conf_esg.c	\
 	conf_e2s.c	\
-	conf_fnt.c
+	conf_fnt.c	\
+	conf_g2s.c	\
+	conf_g2m.c	\
+	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
 
-LIBDIR = libgame
-LIBGAME = $(LIBDIR)/libgame.a
+GAME_EM_DIR = game_em
+GAME_EM = $(GAME_EM_DIR)/game_em.a
+
+GAME_SP_DIR = game_sp
+GAME_SP = $(GAME_SP_DIR)/game_sp.a
+
+RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP)
+AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
 
 ICONBASE = windows_icon
+ICON_BASEPATH = ../Special/Icons/windows_icons
+
 ifeq ($(PLATFORM),cross-win32)
-ICON32X32 = ../graphics/$(ICONBASE)_32x32.bmp
+ICON_PATH = $(ICON_BASEPATH)/default
 ICON = $(ICONBASE).o
 endif
 
+GRAPHICS_DIR = ../graphics
+
 
 # -----------------------------------------------------------------------------
 # build targets
 # -----------------------------------------------------------------------------
 
-all: libgame_dir $(PROGNAME)
+all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) graphics_dir
 
-$(PROGNAME): $(LIBGAME) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
-	$(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
+$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
+	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
+ifdef BUILD_DIST
+	strip $(PROGNAME)
+endif
 
 libgame_dir:
-	@$(MAKE) -C $(LIBDIR)
+	@$(MAKE) -C $(LIBGAME_DIR)
 $(LIBGAME):
-	@$(MAKE) -C $(LIBDIR)
+	@$(MAKE) -C $(LIBGAME_DIR)
+
+game_em_dir:
+	@$(MAKE) -C $(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)
 
 auto-conf:
 	@for i in $(CNFS); do			\
@@ -212,31 +242,42 @@ auto-conf:
 		$(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)
-	@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 $(LIBDIR) clean
+	$(MAKE) -C $(LIBGAME_DIR) clean
+	$(MAKE) -C $(GAME_EM_DIR) clean
+	$(MAKE) -C $(GAME_SP_DIR) clean
 	$(RM) $(OBJS)
-	$(RM) $(LIBGAME)
+	$(RM) $(RNDLIBS)
 
 clean-ico:
 	$(RM) $(ICONBASE).ico
@@ -248,15 +289,37 @@ 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:
+	cd .. && ./$(PROGBASE) --verbose
+
+gdb:
+	cd .. && gdb -batch -x GDB_COMMANDS ./$(PROGBASE)
+
+valgrind:
+	cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out
+
 
 # -----------------------------------------------------------------------------
 # development only
 # -----------------------------------------------------------------------------
 
-dist-clean: clean-obj
+tags:
+	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]
 
 depend:
-	$(MAKE) -C $(LIBDIR) depend
+	$(MAKE) -C $(LIBGAME_DIR) depend
+	$(MAKE) -C $(GAME_EM_DIR) depend
+	$(MAKE) -C $(GAME_SP_DIR) depend
 	for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 
 ifeq (.depend,$(wildcard .depend))