diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 03:22:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 03:22:04 +0200 |
| commit | ca87d439065c705311d0a98076df3c021b187adb (patch) | |
| tree | 0df07b7cd2730e54a9d35230e27e90fe2e0b42f6 | |
| parent | 08675bb39928fff0a31ecc068e290704a358739d (diff) | |
| download | ffmpeg-ca87d439065c705311d0a98076df3c021b187adb.tar.gz | |
configure: Revert sdl hunk of 4fa18c56. This breaks OSX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -2941,7 +2941,11 @@ if enabled libdc1394; then die "ERROR: No version of libdc1394 found " fi -if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then +SDL_CONFIG="${cross_prefix}sdl-config" +if "${SDL_CONFIG}" --version > /dev/null 2>&1; then + sdl_cflags=$("${SDL_CONFIG}" --cflags) + sdl_libs=$("${SDL_CONFIG}" --libs) + check_func_headers SDL.h SDL_Init $sdl_cflags $sdl_libs && check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && enable sdl && check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size |