X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=f9a71038c907129b52d791d5baec70bdac2bf3b5;hb=41cfe645942062496cd063eb46e17d677a76c645;hp=f1e51133067f2f98ecbab8fd95a57b97a94a9618;hpb=52189f4b3b797e08699f67880198b585320cf8bf;p=rocksndiamonds.git diff --git a/src/Makefile b/src/Makefile index f1e51133..f9a71038 100644 --- a/src/Makefile +++ b/src/Makefile @@ -34,15 +34,22 @@ 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 := -lSDL_image $(shell sdl-config --libs) +SDL_LDFLAGS := $(SDL_EXTRA_LIBS) $(shell sdl-config --libs) 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