X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=05eccd9916ed18c56496318ab01a9216a5f4c6b0;hb=8f33ee4940b9c35bf4627b7ef1126d03748da646;hp=21c753a3a715ccd3ffd3da6619a1939f5224fbd4;hpb=27205a1ec1f3a21ed1b9693ec3fd8a55442b79db;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 21c753a3..05eccd99 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,11 +1,16 @@
-#=============================================================================#
-# Makefile for Rocks'n'Diamonds                                               #
-# (c) 1995-2000 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
@@ -23,10 +28,15 @@ endif
 AR = ar
 RANLIB = ranlib
 
+BMP2ICO = bmp2ico
+WINDRES = windres
+
 ifeq ($(PLATFORM),msdos)	# MS-DOS native compiling
 
 RM = del
-PROGNAME = ../rocks.exe
+
+PROGBASE = rocks
+PROGNAME = ../$(PROGBASE).exe
 
 SYS_CFLAGS = -DTARGET_X11
 SYS_LDFLAGS = -s -lalleg
@@ -34,24 +44,33 @@ SYS_LDFLAGS = -s -lalleg
 else				# Unix or cross-compiling for MS-DOS and Win32
 
 RM = rm -f
-PROGNAME = ../rocksndiamonds
+
+PROGBASE = rocksndiamonds
+PROGNAME = ../$(PROGBASE)
 
 ifeq ($(PLATFORM),solaris)
 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
 
 ifeq ($(PLATFORM),cross-msdos)
-PROGNAME = ../rocks.exe
+PROGBASE = rocks
+PROGNAME = ../$(PROGBASE).exe
 TARGET = allegro
 endif
 
 ifeq ($(PLATFORM),cross-win32)
-PROGNAME = ../rocksndiamonds.exe
+EXTRA_LDFLAGS = -lshfolder
+PROGNAME = ../$(PROGBASE).exe
 TARGET = sdl
 endif
 
@@ -62,8 +81,12 @@ endif
 
 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)
 endif
+endif
 
 ifeq ($(TARGET),allegro)
 SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
@@ -89,23 +112,33 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
 
 CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
-DEBUG = -DDEBUG -g
+# 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	\
+	conf_mus.c	\
+	conf_hlp.c	\
 	init.c		\
+	config.c	\
 	events.c	\
 	tools.c		\
 	screens.c	\
@@ -113,13 +146,17 @@ 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	\
+	conf_mus.o	\
+	conf_hlp.o	\
 	init.o		\
+	config.o	\
 	events.o	\
 	tools.o		\
 	screens.o	\
@@ -127,22 +164,75 @@ 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_mus.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	\
+	conf_g2s.c	\
+	conf_g2m.c
+
+CNFS_CMD = ../Scripts/create_element_defs.pl
+
+TIMESTAMP_FILE = conftime.h
+
 LIBDIR = libgame
 LIBGAME = $(LIBDIR)/libgame.a
 
+ICONBASE = windows_icon
+ifeq ($(PLATFORM),cross-win32)
+ICON32X32 = ../graphics/$(ICONBASE)_32x32.bmp
+ICON = $(ICONBASE).o
+endif
+
+
+# -----------------------------------------------------------------------------
+# build targets
+# -----------------------------------------------------------------------------
 
-all: $(PROGNAME)
+all: libgame_dir $(PROGNAME)
 
-$(PROGNAME): $(LIBGAME) $(OBJS)
-	$(CC) $(PROFILING) $(OBJS) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
+$(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)
+
+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
+
+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 /' \
+	> $(TIMESTAMP_FILE)
+
+$(ICON):
+	$(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)
+	echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
 
 .c.o:
 	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
@@ -152,16 +242,20 @@ clean-obj:
 	$(RM) $(OBJS)
 	$(RM) $(LIBGAME)
 
+clean-ico:
+	$(RM) $(ICONBASE).ico
+	$(RM) $(ICONBASE).o
+
 clean-bin:
 	$(RM) $(PROGNAME)
 	$(RM) ../*.exe
 
-clean: clean-obj clean-bin
+clean: clean-obj clean-ico clean-bin
 
 
-#-----------------------------------------------------------------------------#
-# development only stuff                                                      #
-#-----------------------------------------------------------------------------#
+# -----------------------------------------------------------------------------
+# development only
+# -----------------------------------------------------------------------------
 
 dist-clean: clean-obj