Mercurial > sdl-ios-xcode
changeset 1566:5bc2a95f9dcf
Allow adding to the INCLUDE path
Allow overriding the NASMFLAGS
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 21 Mar 2006 09:24:10 +0000 |
| parents | 57431b199aed |
| children | 12b6d331d82a |
| files | configure.in |
| diffstat | 1 files changed, 17 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Tue Mar 21 08:54:50 2006 +0000 +++ b/configure.in Tue Mar 21 09:24:10 2006 +0000 @@ -50,13 +50,14 @@ 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 @@ 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 @@ fi } - dnl Check for clock_gettime() CheckClockGettime() {