Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fix QNX build - prioritize system EGL headers over the Khronos ones
- Loading branch information
Showing
with
4 additions
and
3 deletions.
-
+2
−1
CMakeLists.txt
-
+1
−1
configure
-
+1
−1
configure.in
|
|
@@ -232,7 +232,8 @@ endif() |
|
|
|
|
|
add_definitions(-DUSING_GENERATED_CONFIG_H) |
|
|
# 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 |
|
|
# you only need to have a platform override them if they are disabling. |
|
|
|
|
|
@@ -15677,7 +15677,7 @@ case "$host" in |
|
|
;; |
|
|
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 |
|
|
INCLUDE="-Iinclude $INCLUDE" |
|
|
elif test -d .hg; then |
|
|
|
|
|
@@ -68,7 +68,7 @@ case "$host" in |
|
|
esac |
|
|
|
|
|
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 |
|
|
INCLUDE="-Iinclude $INCLUDE" |
|
|
elif test -d .hg; then |
|
|
|
