rnd-20000901-2-src

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 044e136ddff7e86355652ad288bee9477a1de087..1c20496f6469e9d2041e0202a411ca2e965ad9e6 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,11 +34,33 @@ ifeq ($(PLATFORM),solaris)
 EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
 endif
 
+USE_SDL = true
+# USE_SDL = false
+USE_SDL_OLD_LIBS = 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 +88,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          \
@@ -90,6 +112,8 @@ SRCS =       main.c          \
        network.c       \
        netserv.c       \
        msdos.c         \
+       system.c        \
+       x11.c           \
        sdl.c
 
 OBJS = main.o          \
@@ -112,12 +136,14 @@ OBJS =    main.o          \
        network.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