Fix QNX build - prioritize system EGL headers over the Khronos ones
authorSam Lantinga <slouken@libsdl.org>
Wed, 30 Aug 2017 00:40:06 -0700
changeset 11427381449ca1cd2
parent 11426 8411bceda8dc
child 11428 befae2925565
Fix QNX build - prioritize system EGL headers over the Khronos ones
CMakeLists.txt
configure
configure.in
     1.1 --- a/CMakeLists.txt	Tue Aug 29 23:14:39 2017 -0700
     1.2 +++ b/CMakeLists.txt	Wed Aug 30 00:40:06 2017 -0700
     1.3 @@ -232,7 +232,8 @@
     1.4  
     1.5  add_definitions(-DUSING_GENERATED_CONFIG_H)
     1.6  # General includes
     1.7 -include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include ${SDL2_SOURCE_DIR}/src/video/khronos)
     1.8 +include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include)
     1.9 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter ${SDL2_SOURCE_DIR}/src/video/khronos")
    1.10  
    1.11  # All these ENABLED_BY_DEFAULT vars will default to ON if not specified, so
    1.12  #  you only need to have a platform override them if they are disabling.
     2.1 --- a/configure	Tue Aug 29 23:14:39 2017 -0700
     2.2 +++ b/configure	Wed Aug 30 00:40:06 2017 -0700
     2.3 @@ -15677,7 +15677,7 @@
     2.4          ;;
     2.5  esac
     2.6  
     2.7 -INCLUDE="-I$srcdir/include -I$srcdir/src/video/khronos"
     2.8 +INCLUDE="-I$srcdir/include -idirafter $srcdir/src/video/khronos"
     2.9  if test x$srcdir != x.; then
    2.10      INCLUDE="-Iinclude $INCLUDE"
    2.11  elif test -d .hg; then
     3.1 --- a/configure.in	Tue Aug 29 23:14:39 2017 -0700
     3.2 +++ b/configure.in	Wed Aug 30 00:40:06 2017 -0700
     3.3 @@ -68,7 +68,7 @@
     3.4  esac
     3.5  
     3.6  dnl Set up the compiler and linker flags
     3.7 -INCLUDE="-I$srcdir/include -I$srcdir/src/video/khronos"
     3.8 +INCLUDE="-I$srcdir/include -idirafter $srcdir/src/video/khronos"
     3.9  if test x$srcdir != x.; then
    3.10      INCLUDE="-Iinclude $INCLUDE"
    3.11  elif test -d .hg; then