Skip to content
Permalink
Browse files

Allow adding to the INCLUDE path

Allow overriding the NASMFLAGS
  • Loading branch information
slouken committed Mar 21, 2006
1 parent d3e3cb6 commit 1140a001dcad77867728ae96dc72a44f126a065b
Showing with 17 additions and 15 deletions.
  1. +17 −15 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()
{

0 comments on commit 1140a00

Please sign in to comment.