X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=2aa08a2e4ecfabea77daa109f4e6df4ccd58a40c;hb=92989af5d5884cbc8a1a9a62c9d05e109eaf78d0;hp=d611cd933bd87dac7adc11da0dead917b71baf05;hpb=ad15815ec04f42779d0717a6d291f93b8e847d39;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index d611cd93..2aa08a2e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,11 +1,16 @@
-#=============================================================================#
-# Makefile for Rocks'n'Diamonds                                               #
-# (c) 1995-2002 Holger Schemel, info@artsoft.org                              #
-#=============================================================================#
+# =============================================================================
+# Rocks'n'Diamonds Makefile (src)
+# -----------------------------------------------------------------------------
+# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# =============================================================================
+
+# -----------------------------------------------------------------------------
+# configuration
+# -----------------------------------------------------------------------------
 
 .EXPORT_ALL_VARIABLES:
 
-ifndef PLATFORM			# platform not specified -- try auto detection
+ifndef PLATFORM			# no platform specified -- try auto detection
 ifdef COMSPEC
 PLATFORM = msdos
 else
@@ -130,6 +135,7 @@ LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
 SRCS =	main.c		\
 	conf_gfx.c	\
 	conf_snd.c	\
+	conf_mus.c	\
 	init.c		\
 	config.c	\
 	events.c	\
@@ -146,6 +152,7 @@ SRCS =	main.c		\
 OBJS =	main.o		\
 	conf_gfx.o	\
 	conf_snd.o	\
+	conf_mus.o	\
 	init.o		\
 	config.o	\
 	events.o	\
@@ -161,6 +168,7 @@ OBJS =	main.o		\
 
 CNFS =	conf_gfx.h	\
 	conf_snd.h	\
+	conf_mus.h	\
 	conf_chr.c	\
 	conf_chr.h	\
 	conf_cus.c	\
@@ -168,7 +176,9 @@ CNFS =	conf_gfx.h	\
 	conf_e2g.c	\
 	conf_esg.c	\
 	conf_e2s.c	\
-	conf_fnt.c
+	conf_fnt.c	\
+	conf_g2s.c	\
+	conf_g2m.c
 
 CNFS_CMD = ../Scripts/create_element_defs.pl
 
@@ -184,6 +194,10 @@ ICON = $(ICONBASE).o
 endif
 
 
+# -----------------------------------------------------------------------------
+# build targets
+# -----------------------------------------------------------------------------
+
 all: libgame_dir $(PROGNAME)
 
 $(PROGNAME): $(LIBGAME) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
@@ -206,6 +220,9 @@ conf_gfx.h: conf_gfx.c
 conf_snd.h: conf_snd.c
 	@$(MAKE) auto-conf
 
+conf_mus.h: conf_mus.c
+	@$(MAKE) auto-conf
+
 $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME)
 	@date '+"[%Y-%m-%d %H:%M]"' \
 	| sed -e 's/^/#define COMPILE_DATE_STRING /' \
@@ -234,9 +251,9 @@ clean-bin:
 clean: clean-obj clean-ico clean-bin
 
 
-#-----------------------------------------------------------------------------#
-# development only stuff                                                      #
-#-----------------------------------------------------------------------------#
+# -----------------------------------------------------------------------------
+# development only
+# -----------------------------------------------------------------------------
 
 dist-clean: clean-obj