encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix QNX build - prioritize system EGL headers over the Khronos ones

This commit is contained in:
Sam Lantinga 2017-08-30 00:40:06 -07:00
parent 9ca6292372
commit e53c5c5c50
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -232,7 +232,8 @@ endif()
add_definitions(-DUSING_GENERATED_CONFIG_H) add_definitions(-DUSING_GENERATED_CONFIG_H)
# General includes # General includes
include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include ${SDL2_SOURCE_DIR}/src/video/khronos) include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter ${SDL2_SOURCE_DIR}/src/video/khronos")
# All these ENABLED_BY_DEFAULT vars will default to ON if not specified, so # All these ENABLED_BY_DEFAULT vars will default to ON if not specified, so
# you only need to have a platform override them if they are disabling. # you only need to have a platform override them if they are disabling.

2
configure vendored
View File

@ -15677,7 +15677,7 @@ case "$host" in
;; ;;
esac esac
INCLUDE="-I$srcdir/include -I$srcdir/src/video/khronos" INCLUDE="-I$srcdir/include -idirafter $srcdir/src/video/khronos"
if test x$srcdir != x.; then if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE" INCLUDE="-Iinclude $INCLUDE"
elif test -d .hg; then elif test -d .hg; then

2
configure.in
View File

@ -68,7 +68,7 @@ case "$host" in
esac esac
dnl Set up the compiler and linker flags dnl Set up the compiler and linker flags
INCLUDE="-I$srcdir/include -I$srcdir/src/video/khronos" INCLUDE="-I$srcdir/include -idirafter $srcdir/src/video/khronos"
if test x$srcdir != x.; then if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE" INCLUDE="-Iinclude $INCLUDE"
elif test -d .hg; then elif test -d .hg; then