diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-28 01:04:46 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-28 01:04:46 -0300 |
| commit | 47d6b02f6c3d58141ace48bb5e8971cae56f8874 (patch) | |
| tree | fb14e3249c9f87d72cb26afc10a6deef37d12d53 | |
| parent | d2ec2e27f81989ec11d6d43529b792610776c85c (diff) | |
| parent | d00a0d8e84fef1b9124bfaf71cc17df79ca464a6 (diff) | |
| download | ffmpeg-47d6b02f6c3d58141ace48bb5e8971cae56f8874.tar.gz | |
Merge commit 'd00a0d8e84fef1b9124bfaf71cc17df79ca464a6'
* commit 'd00a0d8e84fef1b9124bfaf71cc17df79ca464a6':
configure: Handle SDL version check through pkg-config
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -6101,9 +6101,7 @@ fi if enabled sdl2; then SDL2_CONFIG="${cross_prefix}sdl2-config" - if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then - check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags && - check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags && + if check_pkg_config "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent; then check_func SDL_Init $sdl2_extralibs $sdl2_cflags || disable sdl2 elif "${SDL2_CONFIG}" --version > /dev/null 2>&1; then |