pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow adding to the INCLUDE path

Browse source 
Allow overriding the NASMFLAGS

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401570
This commit is contained in:
Sam Lantinga 2006-03-21 09:24:10 +00:00
parent de8aa2291c
commit b31a8872e5
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
configure.in
View file

@ -50,13 +50,14 @@ else
fi fi
dnl Set up the compiler and linker flags 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 if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE" SDL_INCLUDE="-Iinclude $SDL_INCLUDE"
fi fi
if test -d /usr/local/include; then if test -d /usr/local/include; then
INCLUDE="$INCLUDE -I/usr/local/include" SDL_INCLUDE="$SDL_INCLUDE -I/usr/local/include"
fi fi
INCLUDE="$SDL_INCLUDE"
case "$host" in case "$host" in
*-*-cygwin*) *-*-cygwin*)
# We build SDL on cygwin without the UNIX emulation layer # 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 if test x$NASM != x -a x$NASM != x'"$NASM"'; then
AC_DEFINE(SDL_HERMES_BLITTERS) AC_DEFINE(SDL_HERMES_BLITTERS)
SOURCES="$SOURCES $srcdir/src/hermes/*.asm" SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
case $ARCH in if test x$NASMFLAGS = x; then
win32) case $ARCH in
NASMFLAGS="-f win32" win32)
;; NASMFLAGS="-f win32"
openbsd) ;;
NASMFLAGS="-f aoutb" openbsd)
;; NASMFLAGS="-f aoutb"
*) ;;
NASMFLAGS="-f elf" *)
;; NASMFLAGS="-f elf"
esac ;;
esac
fi
AC_SUBST(NASM) AC_SUBST(NASM)
AC_SUBST(NASMFLAGS) AC_SUBST(NASMFLAGS)
@ -1892,7 +1895,6 @@ CheckUSBHID()
fi fi
} }
dnl Check for clock_gettime() dnl Check for clock_gettime()
CheckClockGettime() CheckClockGettime()
{ {