From 1dd5dfd3b382a0904ce5eddab6032c7f658bac23 Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 7 Nov 2006 15:53:20 +0000 Subject: [PATCH] (svn r7100) Evaluate the necessary flags for SDL once per make run, not every time the CFLAGS/LIBS variables are used --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c97f73d606..6b3f95a0cf 100644 --- a/Makefile +++ b/Makefile @@ -441,12 +441,14 @@ endif # SDL config ifdef WITH_SDL CDEFS += -DWITH_SDL -CFLAGS += $(shell $(SDL_CONFIG) --cflags) +CCFLAGS_SDL := $(shell $(SDL_CONFIG) --cflags) +CFLAGS += $(CCFLAGS_SDL) ifdef STATIC -LIBS += $(shell $(SDL_CONFIG) --static-libs) +LDFLAGS_SDL := $(shell $(SDL_CONFIG) --static-libs) else -LIBS += $(shell $(SDL_CONFIG) --libs) +LDFLAGS_SDL := $(shell $(SDL_CONFIG) --libs) endif +LIBS += $(LDFLAGS_SDL) endif # zlib config