X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=bff1b9b4ba6019e45a52d591cd16995350da1c46;hp=7333fb2803193b88aeb9f734a75b5b5ab2f152c9;hb=b2a0ff1ddd4430110b331129469dabb8ea7b6ba7;hpb=c3d03cdffce070695ba0520d00667b42b8460087

diff --git a/src/Makefile b/src/Makefile
index 7333fb28..bff1b9b4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,6 +3,7 @@
 #
 
 PROGNAME = rocksndiamonds
+SERVNAME = rnd_server
 
 RM = rm -f
 CC = gcc
@@ -15,23 +16,32 @@ GAME_DIR = -DGAME_DIR=\".\"		# path of the game and its data
 # SCORE_ENTRIES = -DONE_PER_NAME	# only one score entry per name
 SCORE_ENTRIES = -DMANY_PER_NAME		# many score entries per name
 
-# the XPM-Library is needed to build this program:
-XPM_INCLUDE_FILE = -DXPM_INCLUDE_FILE="<X11/xpm.h>"
+# 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 use the Xpm library, convert the GIF files to Xpm
+# files (and the mask files ('*Maske.gif') to xbm files).
+
+# XPM_INCLUDE_FILE = -DXPM_INCLUDE_FILE="<X11/xpm.h>"
 
 CONFIG = $(GAME_DIR) $(SOUNDS) $(JOYSTICK)	\
 	 $(SCORE_ENTRIES) $(XPM_INCLUDE_FILE)
 
 # DEBUG = -DDEBUG -g -ansi -pedantic -Wall
-# DEBUG = -DDEBUG -g -Wall
-DEBUG = -O6
+DEBUG = -DDEBUG -g -Wall
+# DEBUG = -O6
 
 # SYSTEM = -Aa -D_HPUX_SOURCE -Dhpux	# for HP-UX (obsolete)
 # SYSTEM = -DSYSV -Ae			# for HP-UX
-# SYSTEM = -DSYSV			# for systems without 'usleep()'
 # INCL = -I/usr/include/X11R5		# for HP-UX and others
-# LIBS = -lXpm -lX11 -lm
-# LIBS = -L/usr/lib/X11R5 -lXpm -lX11 -lm # for HP-UX and others
-LIBS = -lXpm -lXpm -lXpm -lX11 -lm	# triple -lXpm; else I got an error...
+# 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
+
+# LIBS = -L/usr/X11R6/lib -lXpm -lX11 -lm
+LIBS = -L/usr/X11R6/lib -lX11 -lm
 
 # CFLAGS = -O2 $(CONFIG) $(SYSTEM)
 CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
@@ -46,7 +56,16 @@ SRCS =	main.c		\
 	editor.c	\
 	buttons.c	\
 	files.c		\
-	sound.c
+	tape.c		\
+	sound.c		\
+	joystick.c	\
+	cartoons.c	\
+	gfxload.c	\
+	gifload.c	\
+	gif.c		\
+	send.c		\
+	new.c		\
+	random.c
 
 OBJS =	main.o		\
 	init.o		\
@@ -58,16 +77,33 @@ OBJS =	main.o		\
 	editor.o	\
 	buttons.o	\
 	files.o		\
-	sound.o
+	tape.o		\
+	sound.o		\
+	joystick.o	\
+	cartoons.o	\
+	gfxload.o	\
+	gifload.o	\
+	gif.o		\
+	send.o		\
+	new.o		\
+	random.o
+
+all:	$(PROGNAME) $(SERVNAME)
 
-all:	$(OBJS)
+$(PROGNAME):	$(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $(PROGNAME)
 
+$(SERVNAME):	$(SERVNAME).c
+	$(CC) $(CFLAGS) $(SERVNAME).c $(LIBS) -o $(SERVNAME)
+
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c
 
 clean:
-	$(RM) $(OBJS)
+	$(RM) $(PROGNAME) $(SERVNAME) $(OBJS)
+
+backup:
+	./make_backup.sh
 
 depend:
 	for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend