X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=f9a71038c907129b52d791d5baec70bdac2bf3b5;hb=41cfe645942062496cd063eb46e17d677a76c645;hp=ef2154bac1779cc72c3fb11dd9a74cea2041eab3;hpb=36357e8399d0a42ac45a1cd096aee24a9008b5f5;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index ef2154ba..f9a71038 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,11 +34,31 @@ ifeq ($(PLATFORM),solaris)
 EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
 endif
 
+USE_SDL = true
+USE_SDL_OLD_LIBS = false
+
+ifeq ($(USE_SDL_OLD_LIBS),true)
+SDL_EXTRA_LIBS = -lIMG -lmixer
+else
+SDL_EXTRA_LIBS = -lSDL_image -lSDL_mixer
+endif
+
 SDL_CFLAGS := -DUSE_SDL_LIBRARY $(shell sdl-config --cflags)
-SDL_LDFLAGS := -lIMG $(shell sdl-config --libs)
+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
 
-INCL = $(X11_INCL)
-LIBS = $(X11_LIBS) -lX11 -lm $(EXTRA_LIBS) $(SDL_LDFLAGS)
+INCL = $(SYS_CFLAGS)
+LIBS = $(SYS_LDFLAGS) $(EXTRA_LIBS) -lm
 
 endif
 
@@ -66,9 +86,9 @@ OPTIONS = -DDEBUG -g -Wall			# only for debugging purposes
 # OPTIONS = -O3 -Wall
 # OPTIONS = -O3
 
-# SYSTEM = -DSYSV -Ae		# may be needed for HP-UX
+# SYSTEM = -DSYSV -Ae				# may be needed for HP-UX
 
-CFLAGS = $(OPTIONS) $(SDL_CFLAGS) $(SYSTEM) $(INCL) $(CONFIG)
+CFLAGS = $(OPTIONS) $(SYSTEM) $(SYS_CFLAGS) $(CONFIG)
 
 SRCS =	main.c		\
 	init.c		\
@@ -91,6 +111,7 @@ SRCS =	main.c		\
 	netserv.c	\
 	msdos.c		\
 	system.c	\
+	x11.c		\
 	sdl.c
 
 OBJS =	main.o		\
@@ -114,12 +135,13 @@ OBJS =	main.o		\
 	netserv.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