Commit 47d6b02f authored by James Almer's avatar James Almer

Merge commit 'd00a0d8e'

* commit 'd00a0d8e':
  configure: Handle SDL version check through pkg-config
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents d2ec2e27 d00a0d8e
...@@ -6101,9 +6101,7 @@ fi ...@@ -6101,9 +6101,7 @@ fi
if enabled sdl2; then if enabled sdl2; then
SDL2_CONFIG="${cross_prefix}sdl2-config" SDL2_CONFIG="${cross_prefix}sdl2-config"
if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then if check_pkg_config "sdl2 >= 2.0.1 sdl2 < 2.1.0" 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 &&
check_func SDL_Init $sdl2_extralibs $sdl2_cflags || check_func SDL_Init $sdl2_extralibs $sdl2_cflags ||
disable sdl2 disable sdl2
elif "${SDL2_CONFIG}" --version > /dev/null 2>&1; then elif "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment