From d37bd214e647f9ce911c9e80f695b46f759128b5 Mon Sep 17 00:00:00 2001 From: Themaister Date: Thu, 6 Jan 2011 20:29:04 +0100 Subject: [PATCH] Update build system to check for minimum SDL version. --- qb/config.libs.sh | 2 +- qb/qb.libs.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index b4650c7847..d2f9f6cef1 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -16,7 +16,7 @@ check_lib RSOUND -lrsound rsd_init check_lib ROAR -lroar roar_vs_new check_lib JACK -ljack jack_client_open -check_pkgconf SDL sdl +check_pkgconf SDL sdl 1.2.10 check_critical SDL "Cannot find SDL library." check_lib CG -lCg cgCreateContext diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh index ab8585fc83..579c91a44d 100644 --- a/qb/qb.libs.sh +++ b/qb/qb.libs.sh @@ -106,14 +106,15 @@ check_pkgconf() eval tmpval=\$$tmpval [ "$tmpval" = "no" ] && return 0 - echo -n "Checking presence of package $2 ... " + echo -n "Checking presence of package $2" eval HAVE_$1=no eval $1_CFLAGS="" eval $1_LIBS="" answer=no minver=0.0 - [ ! -z $3 ] && minver=$3 - pkg-config --atleast-version=$minver --exists "$2" && eval HAVE_$1=yes && eval $1_CFLAGS='"`pkg-config $2 --cflags`"' && eval $1_LIBS='"`pkg-config $2 --libs`"' && answer=yes + [ ! -z $3 ] && minver=$3 && echo -n " with minimum version $minver" + echo -n " ... " + pkg-config --atleast-version=$minver "$2" && eval HAVE_$1=yes && eval $1_CFLAGS='"`pkg-config $2 --cflags`"' && eval $1_LIBS='"`pkg-config $2 --libs`"' && answer=yes echo $answer PKG_CONF_USED="$PKG_CONF_USED $1"