浏览代码

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

Sam Lantinga 8 年之前
父节点
当前提交
e53c5c5c50
共有 3 个文件被更改,包括 4 次插入3 次删除
  1. 2 1
      CMakeLists.txt
  2. 1 1
      configure
  3. 1 1
      configure.in

+ 2 - 1
CMakeLists.txt

@@ -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.

+ 1 - 1
configure

@@ -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

+ 1 - 1
configure.in

@@ -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