X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=f2b146b71a5ea3ccda68af4a4ba8db414b8355d7;hb=a8b2caa1d373c84c1b3fc2f615370c2a319051ca;hp=f9c1e232a04432d805a85ce34c5ba5ed78372b95;hpb=c8dd3c1abd6a1daf4f7431a59db721ae7fba3d17;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index f9c1e232..f2b146b7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,11 +1,11 @@
 #=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.4.0                                         #
-# (c) 1995-1999 Holger Schemel, aeglos@valinor.owl.de                         #
+# Makefile for Rocks'n'Diamonds                                               #
+# (c) 1995-2000 Holger Schemel, info@artsoft.org                              #
 #=============================================================================#
 
 ifndef PLATFORM			# platform not specified -- try auto detection
 ifdef COMSPEC
-PLATFORM = dos
+PLATFORM = msdos
 else
 PLATFORM = unix
 endif
@@ -19,26 +19,40 @@ X11_LIBS = -L$(XLIB_PATH)
 endif
 
 
-ifeq ($(PLATFORM),dos)		# DOS / Windows
+ifeq ($(PLATFORM),msdos)	# MS-DOS native compiling
 
 RM = del
 PROGNAME = ../rocks.exe
-LIBS = -s -lm -lalleg
 
-else				# Unix
+SYS_CFLAGS = -DTARGET_X11
+SYS_LDFLAGS = -s -lalleg -lm
+
+else				# Unix; Win32 cross-compiling
 
 RM = rm -f
 PROGNAME = ../rocksndiamonds
 
 ifeq ($(PLATFORM),solaris)
-EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
+EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
 endif
 
-INCL = $(X11_INCL)
-LIBS = $(X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
+ifeq ($(PLATFORM),win32)
+PROGNAME = ../rocksndiamonds.exe
+TARGET = sdl
+else
+PROFILING = -pg
+endif
 
+ifeq ($(TARGET),sdl)
+SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
+SYS_LDFLAGS = -lSDL_image -lSDL_mixer $(shell sdl-config --libs) -lm
+else
+SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
+SYS_LDFLAGS = $(X11_LIBS) -lX11 -lm
 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)\""
@@ -56,16 +70,17 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
 
 CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(SOUNDS) $(JOYSTICK)
+DEBUG = -DDEBUG -g
 
-# OPTIONS = -DDEBUG -g -Wall -ansi -pedantic	# only for debugging purposes
-OPTIONS = -DDEBUG -g -Wall			# only for debugging purposes
+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
 
-# SYSTEM = -DSYSV -Ae		# may be needed for HP-UX
-
-CFLAGS = $(OPTIONS) $(SYSTEM) $(INCL) $(CONFIG)
+CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
+LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
 
 SRCS =	main.c		\
 	init.c		\
@@ -86,7 +101,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		\
@@ -107,18 +125,22 @@ 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) $(LDFLAGS) -o $(PROGNAME)
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
 clean:
 	$(RM) *.o
+	$(RM) ../*.exe
 	$(RM) $(PROGNAME)