projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20000806-1-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index f1e51133067f2f98ecbab8fd95a57b97a94a9618..f9a71038c907129b52d791d5baec70bdac2bf3b5 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-34,15
+34,22
@@
ifeq ($(PLATFORM),solaris)
EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
endif
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_CFLAGS := -DUSE_SDL_LIBRARY $(shell sdl-config --cflags)
-SDL_LDFLAGS :=
-lSDL_image
$(shell sdl-config --libs)
+SDL_LDFLAGS :=
$(SDL_EXTRA_LIBS)
$(shell sdl-config --libs)
X11_CFLAGS = $(X11_INCL)
X11_LDFLAGS = $(X11_LIBS) -lX11
X11_CFLAGS = $(X11_INCL)
X11_LDFLAGS = $(X11_LIBS) -lX11
-USE_SDL = true
-
-ifdef USE_SDL
+ifeq ($(USE_SDL),true)
SYS_CFLAGS = $(SDL_CFLAGS)
SYS_LDFLAGS = $(SDL_LDFLAGS)
else
SYS_CFLAGS = $(SDL_CFLAGS)
SYS_LDFLAGS = $(SDL_LDFLAGS)
else