From 161dc2ddf506b4c0d5b33b22adc22b70c94d1d28 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 5 May 2009 18:19:34 +0000 Subject: [PATCH] fall back to sdl-config if SDL_CFLAGS are empty works around buggy Solaris installations where pkg-config is installed but can't find the SDL config file --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 56172d33..32f4d1a3 100644 --- a/Makefile +++ b/Makefile @@ -187,7 +187,9 @@ ifeq ($(shell which pkg-config > /dev/null; echo $$?),0) # FIXME: introduce CLIENT_CFLAGS SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') SDL_LIBS=$(shell pkg-config --libs sdl) -else +endif +# Use sdl-config if all else fails +ifeq ($(SDL_CFLAGS),) ifeq ($(shell which sdl-config > /dev/null; echo $$?),0) SDL_CFLAGS=$(shell sdl-config --cflags) SDL_LIBS=$(shell sdl-config --libs)