X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=d034771b175b750a31b4dacd6144d3bbaf49e531;hb=8be31c2781126204470171aff7af45713ec42e9e;hp=4a065da30c83d35377a455aace7d9b5ee13a0373;hpb=c21cf4c301f745142f3cbb4987efe6446a3a8c4e;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 4a065da3..d034771b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,111 +1,106 @@
 #=============================================================================#
-# 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                         #
 #=============================================================================#
 
-#-----------------------------------------------------------------------------#
-# configuration section                                                       #
-#-----------------------------------------------------------------------------#
-
-# change this to your favorite ANSI C compiler
-CC = gcc
-
-# on Solaris and similar systems, you'll need to uncomment this
-# EXTRA_LIBS = -lnsl -lsocket 
+ifndef PLATFORM			# platform not specified -- try auto detection
+ifdef COMSPEC
+PLATFORM = dos
+else
+PLATFORM = unix
+endif
+endif
 
-# specify X11 library path on your system
-XLIB_PATH = /usr/X11/lib
+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
 
-# choose directory for read-only game data (like graphics, sounds, levels)
-# RO_GAME_DIR = /usr/games
 
-# choose directory for writable game data (like highscore files)
-# RW_GAME_DIR = /var/games
+ifeq ($(PLATFORM),dos)		# DOS / Windows
 
-# uncomment this if your system has no joystick include file
-# JOYSTICK = -DNO_JOYSTICK
+RM = del
+PROGNAME = ../rocks.exe
+LIBS = -s -lm -lalleg
 
-# uncomment this if your system has no sound
-# SOUNDS = -DNO_SOUNDS
+else				# Unix
 
-# 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 (default)
-# SCORE_ENTRIES = MANY_PER_NAME
+RM = rm -f
+PROGNAME = ../rocksndiamonds
 
-# 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).
+ifeq ($(PLATFORM),solaris)
+EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
+endif
 
-# XPM_INCLUDE_FILE = -DXPM_INCLUDE_FILE="<X11/xpm.h>"
-# EXTRA_X11_LIBS = -lXpm
+ifeq ($(PLATFORM),windows)
+PROGNAME = ../rocksndiamonds.exe
+TARGET = sdl
+else
+PROFILING = -pg
+endif
 
-#-----------------------------------------------------------------------------#
-# you shouldn't need to change anything below                                 #
-#-----------------------------------------------------------------------------#
+ifeq ($(TARGET),sdl)
+USE_SDL = true
+else
+USE_SDL = false
+endif
 
-ifdef COMSPEC
-PLATFORM = dos
+ifeq ($(USE_SDL_OLD_LIBS),true)
+SDL_EXTRA_LIBS = -lIMG -lmixer
 else
-PLATFORM = unix
+SDL_EXTRA_LIBS = -lSDL_image -lSDL_mixer
 endif
 
-ifeq ($(PLATFORM),unix)
-RM = rm -f
-PROGNAME = ../rocksndiamonds
-LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
+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
-RM = del
-PROGNAME = ../rocks.exe
-LIBS = -s -lm -lalleg
+SYS_CFLAGS  = $(X11_CFLAGS)
+SYS_LDFLAGS = $(X11_LDFLAGS)
 endif
 
-CPP = $(CC) -E
+INCL = $(SYS_CFLAGS)
+LIBS = $(SYS_LDFLAGS) $(EXTRA_LIBS) -lm
+
+endif				# (PLATFORM != dos)
 
-ifdef RO_GAME_DIR
+
+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
+ifdef RW_GAME_DIR		# path to writable game data specified
 CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
 endif
 
-ifdef SCORE_ENTRIES
+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)
-
-# DEBUG = -DDEBUG -g -Wall -ansi -pedantic
-DEBUG = -DDEBUG -g -Wall
-# DEBUG = -O3 -Wall -ansi -pedantic
-# DEBUG = -O3 -Wall
-# DEBUG = -O3
 
-# 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) $(SOUNDS) $(JOYSTICK)
+DEBUG = -DDEBUG -g
 
-# 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
 
-# LIBS = -L/usr/X11R6/lib $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
+# SYSTEM = -DSYSV -Ae				# may be needed for HP-UX
 
-# LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
-
-# CFLAGS = -O2 $(CONFIG) $(SYSTEM)
-CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
+CFLAGS = $(OPTIONS) $(SYSTEM) $(SYS_CFLAGS) $(CONFIG)
 
 SRCS =	main.c		\
 	init.c		\
@@ -126,7 +121,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		\
@@ -147,20 +145,29 @@ 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) $(PROFILING) $(OBJS) $(LIBS) -o $(PROGNAME)
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
 clean:
 	$(RM) *.o
+	$(RM) ../*.exe
 	$(RM) $(PROGNAME)
 
+
+#-----------------------------------------------------------------------------#
+# development only stuff                                                      #
+#-----------------------------------------------------------------------------#
+
 depend:
 	for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend