From 5ae8f6ea0bef328d485148813dba358f9da829f6 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Thu, 19 Jan 2006 21:41:38 +0000
Subject: [PATCH] Add support for WITHOUT_SDL make variable.
---
src/conio/Common.gmake | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/conio/Common.gmake b/src/conio/Common.gmake
index 53a39c59d7..5fa929a5a7 100644
--- a/src/conio/Common.gmake
+++ b/src/conio/Common.gmake
@@ -1,25 +1,27 @@
# Find SDL headers!
-ifndef SDL_CONFIG
- ifeq ($(os),darwin)
- ifeq ($(shell if [ -d /Library/Frameworks/SDL.framework ] ; then echo YES ; fi),YES)
- WITH_SDL := 1
- endif
- else
- ifeq ($(shell sdl-config --cflags > /dev/null 2>&1 && echo YES),YES)
- SDL_CONFIG := sdl-config
- WITH_SDL := 1
+ifndef WITHOUT_SDL
+ ifndef SDL_CONFIG
+ ifeq ($(os),darwin)
+ ifeq ($(shell if [ -d /Library/Frameworks/SDL.framework ] ; then echo YES ; fi),YES)
+ WITH_SDL := 1
+ endif
else
- ifeq ($(shell sdl13-config --cflags > /dev/null 2>&1 && echo YES),YES)
- SDL_CONFIG := sdl13-config
+ ifeq ($(shell sdl-config --cflags > /dev/null 2>&1 && echo YES),YES)
+ SDL_CONFIG := sdl-config
WITH_SDL := 1
else
- ifeq ($(shell sdl12-config --cflags > /dev/null 2>&1 && echo YES),YES)
- SDL_CONFIG := sdl12-config
+ ifeq ($(shell sdl13-config --cflags > /dev/null 2>&1 && echo YES),YES)
+ SDL_CONFIG := sdl13-config
WITH_SDL := 1
else
- ifeq ($(shell sdl11-config --cflags > /dev/null 2>&1 && echo YES),YES)
- SDL_CONFIG := sdl11-config
+ ifeq ($(shell sdl12-config --cflags > /dev/null 2>&1 && echo YES),YES)
+ SDL_CONFIG := sdl12-config
WITH_SDL := 1
+ else
+ ifeq ($(shell sdl11-config --cflags > /dev/null 2>&1 && echo YES),YES)
+ SDL_CONFIG := sdl11-config
+ WITH_SDL := 1
+ endif
endif
endif
endif
--
GitLab