X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=ad10d1fea9d186bbe6456f27d52b9dc0e07761d0;hb=c9433eab5c4317ed4f89164b386a7d33562e29be;hp=3269ec511fb22024e3707d44f0496ddd932cc87a;hpb=b40c5be44ed492da183f29d9f2f8184391c31cf0;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 3269ec51..ad10d1fe 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,12 @@ EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
 PLATFORM = unix
 endif
 
+ifeq ($(PLATFORM),macosx)
+# PROGNAME = ../Rocks\'n\'Diamonds.app/Contents/MacOS/$(PROGBASE)
+PLATFORM = unix
+TARGET=sdl
+endif
+
 ifeq ($(PLATFORM),unix)
 PROFILING_FLAGS = -pg
 endif
@@ -108,12 +114,17 @@ OPTIONS = $(DEBUG) -O3 -Wall			# only for debugging purposes
 # 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		\
 	init.c		\
+	config.c	\
 	events.c	\
 	tools.c		\
 	screens.c	\
@@ -121,13 +132,13 @@ SRCS =	main.c		\
 	editor.c	\
 	files.c		\
 	tape.c		\
-	joystick.c	\
 	cartoons.c	\
 	network.c	\
 	netserv.c
 
 OBJS =	main.o		\
 	init.o		\
+	config.o	\
 	events.o	\
 	tools.o		\
 	screens.o	\
@@ -135,11 +146,12 @@ OBJS =	main.o		\
 	editor.o	\
 	files.o		\
 	tape.o		\
-	joystick.o	\
 	cartoons.o	\
 	network.o	\
 	netserv.o
 
+TIMESTAMP_FILE = conftime.h
+
 LIBDIR = libgame
 LIBGAME = $(LIBDIR)/libgame.a
 
@@ -150,13 +162,20 @@ ICON = $(ICONBASE).o
 endif
 
 
-all: $(PROGNAME)
+all: libgame_dir $(PROGNAME)
 
-$(PROGNAME): $(LIBGAME) $(OBJS) $(ICON)
+$(PROGNAME): $(LIBGAME) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
 
+libgame_dir:
+	@$(MAKE) -C $(LIBDIR)
 $(LIBGAME):
-	$(MAKE) -C $(LIBDIR)
+	@$(MAKE) -C $(LIBDIR)
+
+$(TIMESTAMP_FILE): $(SRCS)
+	@date '+"[%Y-%m-%d %H:%M]"' \
+	| sed -e 's/^/#define COMPILE_DATE_STRING /' \
+	> $(TIMESTAMP_FILE)
 
 $(ICON):
 	$(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)