X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=595f5996acb4a4770dcf80e888de840d08f2ee3d;hb=ddaae9de458b7f07b05461101655a1da4c63b380;hp=4010bcfb1bcf537af3ff81766e40e90c0a6dd237;hpb=e6107a527a13127f9bb2a4f501a7be84ec098473;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 4010bcfb..595f5996 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
 #=============================================================================#
 # Makefile for Rocks'n'Diamonds                                               #
-# (c) 1995-2000 Holger Schemel, info@artsoft.org                              #
+# (c) 1995-2002 Holger Schemel, info@artsoft.org                              #
 #=============================================================================#
 
 .EXPORT_ALL_VARIABLES:
@@ -48,6 +48,11 @@ EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
 PLATFORM = unix
 endif
 
+ifeq ($(PLATFORM),macosx)
+PLATFORM = unix
+TARGET=sdl
+endif
+
 ifeq ($(PLATFORM),unix)
 PROFILING_FLAGS = -pg
 endif
@@ -59,6 +64,7 @@ TARGET = allegro
 endif
 
 ifeq ($(PLATFORM),cross-win32)
+EXTRA_LDFLAGS = -lshfolder
 PROGNAME = ../$(PROGBASE).exe
 TARGET = sdl
 endif
@@ -101,19 +107,27 @@ DEBUG = -DDEBUG -g
 # PROFILING = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
-OPTIONS = $(DEBUG) -O3 -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
 
+ifdef BUILD_DIST				# distribution build
+OPTIONS = -O3 -Wall
+endif
+
 CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
 LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
 
 
 SRCS =	main.c		\
+	conf_gfx.c	\
+	conf_snd.c	\
 	init.c		\
+	config.c	\
 	events.c	\
 	tools.c		\
 	screens.c	\
@@ -121,13 +135,15 @@ SRCS =	main.c		\
 	editor.c	\
 	files.c		\
 	tape.c		\
-	joystick.c	\
 	cartoons.c	\
 	network.c	\
 	netserv.c
 
 OBJS =	main.o		\
+	conf_gfx.o	\
+	conf_snd.o	\
 	init.o		\
+	config.o	\
 	events.o	\
 	tools.o		\
 	screens.o	\
@@ -135,11 +151,25 @@ OBJS =	main.o		\
 	editor.o	\
 	files.o		\
 	tape.o		\
-	joystick.o	\
 	cartoons.o	\
 	network.o	\
 	netserv.o
 
+CNFS =	conf_gfx.h	\
+	conf_snd.h	\
+	conf_chr.c	\
+	conf_chr.h	\
+	conf_cus.c	\
+	conf_cus.h	\
+	conf_e2g.c	\
+	conf_esg.c	\
+	conf_e2s.c	\
+	conf_fnt.c
+
+CNFS_CMD = ../Scripts/create_element_defs.pl
+
+TIMESTAMP_FILE = conftime.h
+
 LIBDIR = libgame
 LIBGAME = $(LIBDIR)/libgame.a
 
@@ -152,7 +182,7 @@ endif
 
 all: libgame_dir $(PROGNAME)
 
-$(PROGNAME): $(LIBGAME) $(OBJS) $(ICON)
+$(PROGNAME): $(LIBGAME) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
 
 libgame_dir:
@@ -160,6 +190,23 @@ libgame_dir:
 $(LIBGAME):
 	@$(MAKE) -C $(LIBDIR)
 
+auto-conf:
+	@for i in $(CNFS); do			\
+		echo "$(CNFS_CMD) $$i > $$i";	\
+		$(CNFS_CMD) $$i > $$i;		\
+	done
+
+conf_gfx.h: conf_gfx.c
+	@$(MAKE) auto-conf
+
+conf_snd.h: conf_snd.c
+	@$(MAKE) auto-conf
+
+$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME)
+	@date '+"[%Y-%m-%d %H:%M]"' \
+	| sed -e 's/^/#define COMPILE_DATE_STRING /' \
+	> $(TIMESTAMP_FILE)
+
 $(ICON):
 	$(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)
 	echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)