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

configure: Just don't do the -idirafter on QNX. 

The compiler understands it, but the "qcc" compiler driver doesn't, and the
standard Khronos headers upset QNX anyhow, since they try to include X11
headers in the __unix__ section.
This commit is contained in:
Ryan C. Gordon 2020-05-19 13:22:01 -04:00
parent 72fdc80512
commit a5c654d5c3
2 changed files with 19 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
configure vendored
View File

@ -16000,37 +16000,16 @@ case "$host" in
;; ;;
esac esac
save_CFLAGS="$CFLAGS" INCLUDE="-I$srcdir/include"
have_idirafter="no"
idirafter="-I"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -idirafter option" >&5
$as_echo_n "checking for -idirafter option... " >&6; }
CFLAGS="$save_CFLAGS -idirafter src"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
case "$host" in
*-*-nto-qnx*)
;;
*)
INCLUDE="$INCLUDE -idirafter $srcdir/src/video/khronos"
;;
esac
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
have_idirafter="yes"
idirafter="-idirafter "
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_idirafter" >&5
$as_echo "$have_idirafter" >&6; }
CFLAGS="$save_CFLAGS"
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

27
configure.ac
View File

@ -69,23 +69,18 @@ case "$host" in
;; ;;
esac esac
dnl see if -idirafter is available.
save_CFLAGS="$CFLAGS"
have_idirafter="no"
idirafter="-I"
AC_MSG_CHECKING(for -idirafter option)
CFLAGS="$save_CFLAGS -idirafter src"
AC_TRY_COMPILE([
],[
],[
have_idirafter="yes"
idirafter="-idirafter "
])
AC_MSG_RESULT($have_idirafter)
CFLAGS="$save_CFLAGS"
dnl Set up the compiler and linker flags dnl Set up the compiler and linker flags
INCLUDE="-I$srcdir/include $idirafter$srcdir/src/video/khronos" INCLUDE="-I$srcdir/include"
dnl Don't use our khronos headers on QNX.
case "$host" in
*-*-nto-qnx*)
;;
*)
INCLUDE="$INCLUDE -idirafter $srcdir/src/video/khronos"
;;
esac
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