X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=89e047585eadb073b4b59c7f6f54f5fdf477aaad;hp=50502fa7c49193e088e6f0e62ff9e879fc974e30;hb=601cca5b35649856ff49e1bcb3806592b736662c;hpb=49dab46aa55cb43233c7f9a310593f8bd8debc29

diff --git a/src/Makefile b/src/Makefile
index 50502fa7..89e04758 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,141 +1,239 @@
 #=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.2                                           #
-# (c) 1995-98 Holger Schemel, aeglos@valinor.owl.de                           #
+# Makefile for Rocks'n'Diamonds                                               #
+# (c) 1995-2002 Holger Schemel, info@artsoft.org                              #
 #=============================================================================#
 
-#-----------------------------------------------------------------------------#
-# configuration section                                                       #
-#-----------------------------------------------------------------------------#
+.EXPORT_ALL_VARIABLES:
 
-# change this to your favorite ANSI C compiler
-CC = gcc
+ifndef PLATFORM			# platform not specified -- try auto detection
+ifdef COMSPEC
+PLATFORM = msdos
+else
+PLATFORM = unix
+endif
+endif
 
-# on Solaris and similar systems, you'll need to uncomment this
-# EXTRA_LIBS = -lnsl -lsocket 
+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
 
-# specify X11 library path on your system
-XLIB_PATH = /usr/X11/lib
+AR = ar
+RANLIB = ranlib
 
-# change this to the directory where you want to install game data like levels
-GAME_DIR = .
+BMP2ICO = bmp2ico
+WINDRES = windres
 
-# uncomment this if your system has no joystick include file
-# JOYSTICK = -DNO_JOYSTICK
+ifeq ($(PLATFORM),msdos)	# MS-DOS native compiling
 
-# uncomment this if your system has no sound
-# SOUNDS = -DNO_SOUNDS
+RM = del
 
-# choose if you want to allow many global score file entries for one player
-# when installing the game in a multi user environment, choose this
-# SCORE_ENTRIES = ONE_PER_NAME
-# when installing the game in a single user environment, choose this
-SCORE_ENTRIES = MANY_PER_NAME
+PROGBASE = rocks
+PROGNAME = ../$(PROGBASE).exe
 
-# The XPM-Library is no longer needed to build this program,
-# but is used to load graphics if XPM_INCLUDE_FILE is defined,
-# because the GIF loading routines are still a bit beta.
-# If you want to use the Xpm library, convert the GIF files to Xpm
-# files (and you need corresponding mask files in xbm format).
+SYS_CFLAGS = -DTARGET_X11
+SYS_LDFLAGS = -s -lalleg
 
-# XPM_INCLUDE_FILE = -DXPM_INCLUDE_FILE="<X11/xpm.h>"
-# EXTRA_X11_LIBS = -lXpm
+else				# Unix or cross-compiling for MS-DOS and Win32
 
-#-----------------------------------------------------------------------------#
-# you shouldn't need to change anything below                                 #
-#-----------------------------------------------------------------------------#
+RM = rm -f
 
-PROGNAME = rocksndiamonds
+PROGBASE = rocksndiamonds
+PROGNAME = ../$(PROGBASE)
 
-RM = rm -f
-CPP = $(CC) -E
+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
 
-CONFIG_GAME_DIR = -DGAME_DIR="\"$(GAME_DIR)\""
+ifeq ($(PLATFORM),cross-msdos)
+PROGBASE = rocks
+PROGNAME = ../$(PROGBASE).exe
+TARGET = allegro
+endif
+
+ifeq ($(PLATFORM),cross-win32)
+PROGNAME = ../$(PROGBASE).exe
+TARGET = sdl
+endif
+
+ifeq ($(TARGET),x11)
+SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
+SYS_LDFLAGS = $(X11_LIBS) -lX11
+endif
+
+ifeq ($(TARGET),sdl)
+SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
+SYS_LDFLAGS = -lSDL_image -lSDL_mixer $(shell sdl-config --libs)
+endif
+
+ifeq ($(TARGET),allegro)
+SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
+SYS_LDFLAGS = -lalleg
+endif
+
+endif				# (PLATFORM != msdos)
+
+
+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
+CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
+endif
+
+ifdef SCORE_ENTRIES		# number of score entries per player specified
 CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
+endif
 
-CONFIG = $(CONFIG_GAME_DIR) $(SOUNDS) $(JOYSTICK)	\
-	 $(CONFIG_SCORE_ENTRIES) $(XPM_INCLUDE_FILE)
+CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
-# DEBUG = -DDEBUG -g -ansi -pedantic -Wall
-DEBUG = -DDEBUG -g -Wall
-# DEBUG = -O6
 
-# SYSTEM = -Aa -D_HPUX_SOURCE -Dhpux	# for HP-UX (obsolete)
-# SYSTEM = -DSYSV -Ae			# for HP-UX
-# INCL = -I/usr/include/X11R5		# for HP-UX and others
-# INCL = -I/usr/local/X11/include	# for SunOS and others
-# LIBS = -L/usr/lib/X11R5 -lXpm -lX11 -lm
-#					# for HP-UX and others
-# LIBS = -L/usr/local/X11/lib -lXpm -lX11 -lm -lsocket -R/usr/local/X11/lib
-#					# for SunOS and others
+CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
+DEBUG = -DDEBUG -g
+# PROFILING = $(PROFILING_FLAGS)
 
-# LIBS = -L/usr/X11R6/lib -lXpm -lX11 -lm
-# LIBS = -L/usr/X11R6/lib -lX11 -lm
+# OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
+OPTIONS = $(DEBUG) -O3 -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
 
-# LIBS = -L/usr/X11R6/lib $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
-LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
+ifdef BUILD_DIST				# distribution build
+OPTIONS = -O3 -Wall
+endif
+
+CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
+LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
 
-# CFLAGS = -O2 $(CONFIG) $(SYSTEM)
-CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
 
 SRCS =	main.c		\
+	conf_gfx.c	\
+	conf_snd.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	\
-	gifload.c	\
-	gif.c		\
-	send.c		\
-	new.c		\
 	network.c	\
 	netserv.c
 
 OBJS =	main.o		\
+	conf_gfx.o	\
+	conf_snd.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	\
-	gifload.o	\
-	gif.o		\
-	send.o		\
-	new.o		\
 	network.o	\
 	netserv.o
 
-all:	$(PROGNAME)
+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
+
+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
+
+
+all: libgame_dir $(PROGNAME)
 
-$(PROGNAME):	$(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) -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)
+
+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)
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
+
+clean-obj:
+	$(MAKE) -C $(LIBDIR) clean
+	$(RM) $(OBJS)
+	$(RM) $(LIBGAME)
 
-clean:
-	$(RM) $(PROGNAME) $(SERVNAME) $(OBJS)
+clean-ico:
+	$(RM) $(ICONBASE).ico
+	$(RM) $(ICONBASE).o
+
+clean-bin:
+	$(RM) $(PROGNAME)
+	$(RM) ../*.exe
+
+clean: clean-obj clean-ico clean-bin
+
+
+#-----------------------------------------------------------------------------#
+# development only stuff                                                      #
+#-----------------------------------------------------------------------------#
 
-backup:
-	./make_backup.sh
+dist-clean: clean-obj
 
 depend:
+	$(MAKE) -C $(LIBDIR) depend
 	for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 
 ifeq (.depend,$(wildcard .depend))