From 2ec2eb82df249d65eed824badd57175fb6155134 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 6 Apr 2020 19:26:51 +0000
Subject: [PATCH] Fix SDL detection.
---
src/conio/Common.gmake | 6 +++---
src/xpdev/Common.gmake | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/conio/Common.gmake b/src/conio/Common.gmake
index 0d3badf391..c3d4d025c3 100644
--- a/src/conio/Common.gmake
+++ b/src/conio/Common.gmake
@@ -63,7 +63,7 @@ endif
ifdef USE_SDL
ifndef WITH_SDL_AUDIO
ifdef SDL_CONFIG
- ifeq ($(shell command -v ${SDL_CONFIG} && if [ `${SDL_CONFIG} --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
+ ifeq ($(shell command -v ${SDL_CONFIG} > /dev/null && if [ `${SDL_CONFIG} --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
WITH_SDL := 1
endif
else
@@ -76,11 +76,11 @@ ifdef USE_SDL
CIOLIB-MT_LDFLAGS += -Wl,-rpath,@executable_path/../Frameworks
endif
else
- ifeq ($(shell command -v sdl2-config && sdl2-config --cflags > /dev/null 2>&1 && echo YES),YES)
+ ifeq ($(shell command -v sdl2-config > /dev/null && sdl2-config --cflags > /dev/null 2>&1 && echo YES),YES)
SDL_CONFIG := sdl2-config
WITH_SDL := 1
else
- ifeq ($(shell command -v sdl-config && if [ `sdl-config --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
+ ifeq ($(shell command -v sdl-config > /dev/null && if [ `sdl-config --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
SDL_CONFIG := sdl-config
WITH_SDL := 1
endif
diff --git a/src/xpdev/Common.gmake b/src/xpdev/Common.gmake
index 8c0667a4f6..d6e13f0e00 100644
--- a/src/xpdev/Common.gmake
+++ b/src/xpdev/Common.gmake
@@ -98,7 +98,7 @@ endif
# Find SDL headers!
ifdef USE_SDL_AUDIO
ifdef SDL_CONFIG
- ifeq ($(shell if [ `${SDL_CONFIG} --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
+ ifeq ($(shell command -v ${SDL_CONFIG} > /dev/null && if [ `${SDL_CONFIG} --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
WITH_SDL_AUDIO := 1
endif
else
@@ -111,11 +111,11 @@ ifdef USE_SDL_AUDIO
CIOLIB-MT_LDFLAGS += -Wl,-rpath,@executable_path/../Frameworks
endif
else
- ifeq ($(shell sdl2-config --cflags > /dev/null 2>&1 && echo YES),YES)
+ ifeq ($(shell command -v sdl2-config > /dev/null && sdl2-config --cflags > /dev/null 2>&1 && echo YES),YES)
SDL_CONFIG := sdl2-config
WITH_SDL_AUDIO := 1
else
- ifeq ($(shell if [ `sdl-config --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
+ ifeq ($(shell command -v sdl-config > /dev/null && if [ `sdl-config --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
SDL_CONFIG := sdl-config
WITH_SDL_AUDIO := 1
endif
--
GitLab