X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=fe9f33e07d3c794fbf079245a806f53640143d43;hp=d034771b175b750a31b4dacd6144d3bbaf49e531;hb=b05bf3dca0ec7d951f1113066093843804e5be06;hpb=8be31c2781126204470171aff7af45713ec42e9e

diff --git a/src/Makefile b/src/Makefile
index d034771b..2a1afc90 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,174 +1,345 @@
-#=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.4.0                                         #
-# (c) 1995-1999 Holger Schemel, aeglos@valinor.owl.de                         #
-#=============================================================================#
-
-ifndef PLATFORM			# platform not specified -- try auto detection
-ifdef COMSPEC
-PLATFORM = dos
-else
+# =============================================================================
+# Rocks'n'Diamonds - McDuffin Strikes Back!
+# -----------------------------------------------------------------------------
+# (c) 1995-2014 by Artsoft Entertainment
+#                  Holger Schemel
+#                  info@artsoft.org
+#                  http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# src/Makefile
+# =============================================================================
+
+# -----------------------------------------------------------------------------
+# configuration
+# -----------------------------------------------------------------------------
+
+.EXPORT_ALL_VARIABLES:
+
+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
 
+CONVERT = convert
+WINDRES = windres
 
-ifeq ($(PLATFORM),dos)		# DOS / Windows
+CONVERT_ICON_ARGS = -transparent black -background transparent
 
-RM = del
-PROGNAME = ../rocks.exe
-LIBS = -s -lm -lalleg
+PROGBASE = rocksndiamonds
 
-else				# Unix
+ifdef SPECIAL_EDITION			# create special edition
+PROGBASE = $(SPECIAL_EDITION)
+endif
 
-RM = rm -f
-PROGNAME = ../rocksndiamonds
+PROGNAME = ../$(PROGBASE)
+
+
+# -----------------------------------------------------------------------------
+# configuring platform
+# -----------------------------------------------------------------------------
 
-ifeq ($(PLATFORM),solaris)
-EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
+ifeq ($(PLATFORM),solaris)		# native compiling to Solaris
+EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
+PLATFORM = unix
 endif
 
-ifeq ($(PLATFORM),windows)
-PROGNAME = ../rocksndiamonds.exe
+ifeq ($(PLATFORM),macosx)		# native compiling to Mac OS X
+EXTRA_LDFLAGS = -lstdc++
+PLATFORM = unix
 TARGET = sdl
-else
-PROFILING = -pg
 endif
 
-ifeq ($(TARGET),sdl)
-USE_SDL = true
-else
-USE_SDL = false
+ifeq ($(PLATFORM),unix)			# native compiling to Unix (generic)
+PROFILING_FLAGS = -pg
 endif
 
-ifeq ($(USE_SDL_OLD_LIBS),true)
-SDL_EXTRA_LIBS = -lIMG -lmixer
-else
-SDL_EXTRA_LIBS = -lSDL_image -lSDL_mixer
+ifeq ($(PLATFORM),cross-win32)		# cross-compiling to Windows
+PROGNAME = ../$(PROGBASE).exe
+EXTRA_LDFLAGS = -lshfolder -lwsock32
+# TARGET = sdl
+TARGET = sdl2
 endif
 
-SDL_CFLAGS := -DUSE_SDL_LIBRARY $(shell sdl-config --cflags)
-SDL_LDFLAGS := $(SDL_EXTRA_LIBS) $(shell sdl-config --libs)
 
-X11_CFLAGS = $(X11_INCL)
-X11_LDFLAGS = $(X11_LIBS) -lX11
+# -----------------------------------------------------------------------------
+# configuring target
+# -----------------------------------------------------------------------------
 
-ifeq ($(USE_SDL),true)
-SYS_CFLAGS  = $(SDL_CFLAGS)
-SYS_LDFLAGS = $(SDL_LDFLAGS)
-else
-SYS_CFLAGS  = $(X11_CFLAGS)
-SYS_LDFLAGS = $(X11_LDFLAGS)
+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_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
-INCL = $(SYS_CFLAGS)
-LIBS = $(SYS_LDFLAGS) $(EXTRA_LIBS) -lm
+ifeq ($(TARGET),sdl2)			# compiling for SDL2 target
+SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
+SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net -lsmpeg2
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl2-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 -lmikmod
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
+endif
+
+ifeq ($(TARGET),sdl2-static)		# compiling for SDL2 target (static)
+SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
+SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net -lsmpeg2 -lmikmod
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl2-config --static-libs)
+endif
 
-endif				# (PLATFORM != dos)
 
+# -----------------------------------------------------------------------------
+# 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
+ifdef SCORE_ENTRIES			# number of score entries per player
 CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
 endif
 
-CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
+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_DIR) $(CONFIG_SCORE_ENTRIES) $(SOUNDS) $(JOYSTICK)
+CONFIG = $(CONFIG_GAME) $(JOYSTICK)
 DEBUG = -DDEBUG -g
+# PROFILING = $(PROFILING_FLAGS)
 
-OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
+# 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 -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
 
-# SYSTEM = -DSYSV -Ae				# may be needed for HP-UX
+ifdef BUILD_DIST			# distribution build
+OPTIONS = -O3 -Wall
+endif
+
+CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
 
-CFLAGS = $(OPTIONS) $(SYSTEM) $(SYS_CFLAGS) $(CONFIG)
 
 SRCS =	main.c		\
+	conf_gfx.c	\
+	conf_snd.c	\
+	conf_mus.c	\
+	conf_hlp.c	\
 	init.c		\
+	config.c	\
 	events.c	\
 	tools.c		\
 	screens.c	\
-	misc.c		\
 	game.c		\
 	editor.c	\
-	buttons.c	\
 	files.c		\
 	tape.c		\
-	sound.c		\
-	joystick.c	\
 	cartoons.c	\
-	random.c	\
-	pcx.c		\
-	image.c		\
 	network.c	\
-	netserv.c	\
-	msdos.c		\
-	system.c	\
-	x11.c		\
-	sdl.c
+	netserv.c
 
 OBJS =	main.o		\
+	conf_gfx.o	\
+	conf_snd.o	\
+	conf_mus.o	\
+	conf_hlp.o	\
 	init.o		\
+	config.o	\
 	events.o	\
 	tools.o		\
 	screens.o	\
-	misc.o		\
 	game.o		\
 	editor.o	\
-	buttons.o	\
 	files.o		\
 	tape.o		\
-	sound.o		\
-	joystick.o	\
 	cartoons.o	\
-	random.o	\
-	pcx.o		\
-	image.o		\
 	network.o	\
-	netserv.o	\
-	msdos.o		\
-	system.o	\
-	x11.o		\
-	sdl.o
+	netserv.o
+
+CNFS =	conf_gfx.h	\
+	conf_snd.h	\
+	conf_mus.h	\
+	conf_chr.c	\
+	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_g2s.c	\
+	conf_g2m.c	\
+	conf_var.c	\
+	conf_act.c
+
+CNFS_CMD = ../build-scripts/create_element_defs.pl
+
+TIMESTAMP_FILE = conftime.h
+
+LIBGAME_DIR = libgame
+LIBGAME = $(LIBGAME_DIR)/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)
+ifdef SPECIAL_EDITION
+# ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
+ICON_PATH = $(ICON_BASEPATH)/$(SPECIAL_EDITION)
+else
+# ICONSUFFIX = 32x32
+ICON_PATH = $(ICON_BASEPATH)/default
+endif
+# ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
+ICON = $(ICONBASE).o
+endif
+
+GRAPHICS_DIR = ../graphics
+
+
+# -----------------------------------------------------------------------------
+# build targets
+# -----------------------------------------------------------------------------
+
+all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) graphics_dir
+
+$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
+	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
+
+libgame_dir:
+	@$(MAKE) -C $(LIBGAME_DIR)
+$(LIBGAME):
+	@$(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			\
+		echo "$(CNFS_CMD) $$i > $$i";	\
+		$(CNFS_CMD) $$i > $$i;		\
+	done
+
+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 $(CNFS_CMD)
+	@$(MAKE) auto-conf
+
+conf_mus.h: conf_mus.c $(CNFS_CMD)
+	@$(MAKE) auto-conf
 
-all:	$(PROGNAME)
+# $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
+$(TIMESTAMP_FILE): $(SRCS) $(RNDLIBS)
+	@date '+"%Y-%m-%d %H:%M"' \
+	| sed -e 's/^/#define COMPILE_DATE_STRING /' \
+	> $(TIMESTAMP_FILE)
 
-$(PROGNAME):	$(OBJS)
-	$(CC) $(PROFILING) $(OBJS) $(LIBS) -o $(PROGNAME)
+$(ICON):
+#	$(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
 
-clean:
-	$(RM) *.o
-	$(RM) ../*.exe
+graphics_dir:
+	@$(MAKE) -C $(GRAPHICS_DIR)
+
+clean-obj:
+	$(MAKE) -C $(LIBGAME_DIR) clean
+	$(MAKE) -C $(GAME_EM_DIR) clean
+	$(MAKE) -C $(GAME_SP_DIR) clean
+	$(RM) $(OBJS)
+	$(RM) $(RNDLIBS)
+#	$(RM) $(LIBGAME)
+#	$(RM) $(GAME_EM)
+#	$(RM) $(GAME_SP)
+
+clean-ico:
+	$(RM) $(ICONBASE).ico
+	$(RM) $(ICONBASE).o
+
+clean-bin:
 	$(RM) $(PROGNAME)
+	$(RM) ../*.exe
+
+clean: clean-obj clean-ico clean-bin
+
+clean-git: clean auto-conf-clean
+	@$(MAKE) -C $(GRAPHICS_DIR) clean
+
+
+# -----------------------------------------------------------------------------
+# 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
 
-#-----------------------------------------------------------------------------#
-# development only stuff                                                      #
-#-----------------------------------------------------------------------------#
+tags:
+	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]
 
 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))