diff options
| author | rubidium <rubidium@openttd.org> | 2015-08-09 12:41:54 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2015-08-09 12:41:54 +0000 |
| commit | 95ccddd6fe3c9e06a7717103b29a5d2f8da7ae16 (patch) | |
| tree | 77d907adafd7a897a8494a928d8f6068131442c5 | |
| parent | b8bb123580b31916771f186ab9d6e25d0b1aaa03 (diff) | |
| download | openttd-95ccddd6fe3c9e06a7717103b29a5d2f8da7ae16.tar.xz | |
(svn r27373) -Codechange: make sdl detection and configuration use pkg-config
| -rw-r--r-- | config.lib | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/config.lib b/config.lib index 52c9aaee1..4dbf85800 100644 --- a/config.lib +++ b/config.lib @@ -2407,33 +2407,7 @@ detect_sdl() { sleep 5 fi - if [ "$with_sdl" = "1" ] || [ "$with_sdl" = "" ] || [ "$with_sdl" = "2" ]; then - sdl_config="sdl-config" - else - sdl_config="$with_sdl" - fi - - version=`$sdl_config --version 2>/dev/null` - ret=$? - log 2 "executing $sdl_config --version" - log 2 " returned $version" - log 2 " exit code $ret" - - if [ -z "$version" ] || [ "$ret" != "0" ]; then - log 1 "checking SDL... not found" - - # It was forced, so it should be found. - if [ "$with_sdl" != "1" ]; then - log 1 "configure: error: sdl-config couldn't be found" - log 1 "configure: error: you supplied '$with_sdl', but it seems invalid" - exit 1 - fi - - sdl_config="" - return 0 - fi - - log 1 "checking SDL... found" + detect_pkg_config "$with_sdl" "sdl" "sdl_config" "1.2" } detect_osx_sdk() { @@ -3562,7 +3536,7 @@ showhelp() { echo " --with-allegro[=\"pkg-config allegro\"]" echo " enables Allegro video driver support" echo " --with-cocoa enables COCOA video driver (OSX ONLY)" - echo " --with-sdl[=sdl-config] enables SDL video driver support" + echo " --with-sdl[=\"pkg-config sdl\"] enables SDL video driver support" echo " --with-zlib[=zlib.a] enables zlib support" echo " --with-liblzma[=\"pkg-config liblzma\"]" echo " enables liblzma support" |