mirror of
https://github.com/joel16/SDL2.git
synced 2025-03-03 17:07:15 +00:00
Allow adding to the INCLUDE path
Allow overriding the NASMFLAGS --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401570
This commit is contained in:
parent
de8aa2291c
commit
b31a8872e5
32
configure.in
32
configure.in
@ -50,13 +50,14 @@ else
|
||||
fi
|
||||
|
||||
dnl Set up the compiler and linker flags
|
||||
INCLUDE="-I$srcdir/include $INCLUDE"
|
||||
SDL_INCLUDE="-I$srcdir/include $SDL_INCLUDE"
|
||||
if test x$srcdir != x.; then
|
||||
INCLUDE="-Iinclude $INCLUDE"
|
||||
SDL_INCLUDE="-Iinclude $SDL_INCLUDE"
|
||||
fi
|
||||
if test -d /usr/local/include; then
|
||||
INCLUDE="$INCLUDE -I/usr/local/include"
|
||||
SDL_INCLUDE="$SDL_INCLUDE -I/usr/local/include"
|
||||
fi
|
||||
INCLUDE="$SDL_INCLUDE"
|
||||
case "$host" in
|
||||
*-*-cygwin*)
|
||||
# We build SDL on cygwin without the UNIX emulation layer
|
||||
@ -589,17 +590,19 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [default=yes]
|
||||
if test x$NASM != x -a x$NASM != x'"$NASM"'; then
|
||||
AC_DEFINE(SDL_HERMES_BLITTERS)
|
||||
SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
|
||||
case $ARCH in
|
||||
win32)
|
||||
NASMFLAGS="-f win32"
|
||||
;;
|
||||
openbsd)
|
||||
NASMFLAGS="-f aoutb"
|
||||
;;
|
||||
*)
|
||||
NASMFLAGS="-f elf"
|
||||
;;
|
||||
esac
|
||||
if test x$NASMFLAGS = x; then
|
||||
case $ARCH in
|
||||
win32)
|
||||
NASMFLAGS="-f win32"
|
||||
;;
|
||||
openbsd)
|
||||
NASMFLAGS="-f aoutb"
|
||||
;;
|
||||
*)
|
||||
NASMFLAGS="-f elf"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
AC_SUBST(NASM)
|
||||
AC_SUBST(NASMFLAGS)
|
||||
|
||||
@ -1892,7 +1895,6 @@ CheckUSBHID()
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
dnl Check for clock_gettime()
|
||||
CheckClockGettime()
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user