X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=17615f9017d8ba7bc57e3dd235d7b6fc74b647e1;hb=0e5a0f487acaed09a34c655b83ea637c83f4a0f0;hp=965c05884d96e86601f8718dd28242b0c809cc75;hpb=629ac5b85f0d60b24828590de3430c52f42607dc;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 965c0588..17615f90 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,9 +1,9 @@
 #=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.2                                           #
-# (c) 1995-98 Holger Schemel, aeglos@valinor.owl.de                           #
+# Makefile for Rocks'n'Diamonds 1.4.0                                         #
+# (c) 1995-1999 Holger Schemel, aeglos@valinor.owl.de                         #
 #=============================================================================#
 
-ifndef PLATFORM			# platform not defined -- try auto detection
+ifndef PLATFORM			# platform not specified -- try auto detection
 ifdef COMSPEC
 PLATFORM = dos
 else
@@ -18,29 +18,12 @@ X11_INCL = -I$(XINC_PATH)
 X11_LIBS = -L$(XLIB_PATH)
 endif
 
-ifndef GAME_DIR			# path to game data not defined -- try '.'
-GAME_DIR = .
-endif
-
-ifndef SCORE_ENTRIES		# number of score entries per player undefined
-SCORE_ENTRIES = MANY_PER_NAME
-endif
-
-
-# The Xpm library is no longer needed to build this program,
-# but is used to load graphics if XPM_INCLUDE_FILE is defined.
-# If you want to use the Xpm library, convert the PCX files to XPM
-# files (and you need corresponding mask files in X11 Bitmap format).
-
-# XPM_INCLUDE_FILE = -DXPM_INCLUDE_FILE="<X11/xpm.h>"
-# EXTRA_X11_LIBS = -lXpm
-
 
 ifeq ($(PLATFORM),dos)		# DOS / Windows
 
 RM = del
-PROGNAME = ..\rocks.exe
-LIBS = -lm -lalleg
+PROGNAME = ../rocks.exe
+LIBS = -s -lm -lalleg
 
 else				# Unix
 
@@ -51,24 +34,61 @@ ifeq ($(PLATFORM),solaris)
 EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
 endif
 
-INCL = $(X11_INCL)
-LIBS = $(X11_LIBS) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
+USE_SDL = true
+USE_SDL_OLD_LIBS = true
 
+ifeq ($(USE_SDL_OLD_LIBS),true)
+SDL_EXTRA_LIBS = -lIMG
+else
+SDL_EXTRA_LIBS = -lSDL_image
 endif
 
+SDL_CFLAGS := -DUSE_SDL_LIBRARY $(shell sdl-config --cflags)
+SDL_LDFLAGS := $(SDL_EXTRA_LIBS) $(shell sdl-config --libs)
+
+X11_CFLAGS = $(X11_INCL)
+X11_LDFLAGS = $(X11_LIBS) -lX11
+
+ifeq ($(USE_SDL),true)
+SYS_CFLAGS  = $(SDL_CFLAGS)
+SYS_LDFLAGS = $(SDL_LDFLAGS)
+else
+SYS_CFLAGS  = $(X11_CFLAGS)
+SYS_LDFLAGS = $(X11_LDFLAGS)
+endif
 
-CONFIG_GAME_DIR = -DGAME_DIR="\"$(GAME_DIR)\""
+INCL = $(SYS_CFLAGS)
+LIBS = $(SYS_LDFLAGS) $(EXTRA_LIBS) -lm
+
+endif
+
+
+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_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
+
 
-CONFIG = $(CONFIG_GAME_DIR) $(SOUNDS) $(JOYSTICK)	\
-	 $(CONFIG_SCORE_ENTRIES) $(XPM_INCLUDE_FILE)
+CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(SOUNDS) $(JOYSTICK)
 
-# OPTIONS = -DDEBUG -g -Wall	# only for debugging purposes
-OPTIONS = -O3
+# OPTIONS = -DDEBUG -g -Wall -ansi -pedantic	# only for debugging purposes
+OPTIONS = -DDEBUG -g -Wall			# only for debugging purposes
+# OPTIONS = -O3 -Wall -ansi -pedantic
+# OPTIONS = -O3 -Wall
+# OPTIONS = -O3
 
-# SYSTEM = -DSYSV -Ae		# maybe needed for HP-UX
+# SYSTEM = -DSYSV -Ae				# may be needed for HP-UX
 
-CFLAGS = $(OPTIONS) $(SYSTEM) $(INCL) $(CONFIG)
+CFLAGS = $(OPTIONS) $(SYSTEM) $(SYS_CFLAGS) $(CONFIG)
 
 SRCS =	main.c		\
 	init.c		\
@@ -89,7 +109,10 @@ SRCS =	main.c		\
 	image.c		\
 	network.c	\
 	netserv.c	\
-	msdos.c
+	msdos.c		\
+	system.c	\
+	x11.c		\
+	sdl.c
 
 OBJS =	main.o		\
 	init.o		\
@@ -110,12 +133,15 @@ OBJS =	main.o		\
 	image.o		\
 	network.o	\
 	netserv.o	\
-	msdos.o
+	msdos.o		\
+	system.o	\
+	x11.o		\
+	sdl.o
 
 all:	$(PROGNAME)
 
 $(PROGNAME):	$(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $(PROGNAME)
+	$(CC) $(OBJS) $(LIBS) -o $(PROGNAME)
 
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c