Mercurial > sdl-ios-xcode

comparison configure.in @ 1566:5bc2a95f9dcf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1565:57431b199aed 1566:5bc2a95f9dcf
48 else 48 else
49 AC_DEFINE(SDL_BYTEORDER, 1234) 49 AC_DEFINE(SDL_BYTEORDER, 1234)
50 fi 50 fi
51 51
52 dnl Set up the compiler and linker flags 52 dnl Set up the compiler and linker flags
53 INCLUDE="-I$srcdir/include $INCLUDE" 53 SDL_INCLUDE="-I$srcdir/include $SDL_INCLUDE"
54 if test x$srcdir != x.; then 54 if test x$srcdir != x.; then
55 INCLUDE="-Iinclude $INCLUDE" 55 SDL_INCLUDE="-Iinclude $SDL_INCLUDE"
56 fi 56 fi
57 if test -d /usr/local/include; then 57 if test -d /usr/local/include; then
58 INCLUDE="$INCLUDE -I/usr/local/include" 58 SDL_INCLUDE="$SDL_INCLUDE -I/usr/local/include"
59 fi 59 fi
60 INCLUDE="$SDL_INCLUDE"
60 case "$host" in 61 case "$host" in
61 *-*-cygwin*) 62 *-*-cygwin*)
62 # We build SDL on cygwin without the UNIX emulation layer 63 # We build SDL on cygwin without the UNIX emulation layer
63 BASE_CFLAGS="-I/usr/include/mingw -mno-cygwin" 64 BASE_CFLAGS="-I/usr/include/mingw -mno-cygwin"
64 BASE_LDFLAGS="-mno-cygwin" 65 BASE_LDFLAGS="-mno-cygwin"
587 if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then 588 if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
588 AC_PATH_PROG(NASM, nasm) 589 AC_PATH_PROG(NASM, nasm)
589 if test x$NASM != x -a x$NASM != x'"$NASM"'; then 590 if test x$NASM != x -a x$NASM != x'"$NASM"'; then
590 AC_DEFINE(SDL_HERMES_BLITTERS) 591 AC_DEFINE(SDL_HERMES_BLITTERS)
591 SOURCES="$SOURCES $srcdir/src/hermes/*.asm" 592 SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
592 case $ARCH in 593 if test x$NASMFLAGS = x; then
593 win32) 594 case $ARCH in
594 NASMFLAGS="-f win32" 595 win32)
595 ;; 596 NASMFLAGS="-f win32"
596 openbsd) 597 ;;
597 NASMFLAGS="-f aoutb" 598 openbsd)
598 ;; 599 NASMFLAGS="-f aoutb"
599 *) 600 ;;
600 NASMFLAGS="-f elf" 601 *)
601 ;; 602 NASMFLAGS="-f elf"
602 esac 603 ;;
604 esac
605 fi
603 AC_SUBST(NASM) 606 AC_SUBST(NASM)
604 AC_SUBST(NASMFLAGS) 607 AC_SUBST(NASMFLAGS)
605 608
606 case "$host" in 609 case "$host" in
607 # this line is needed for QNX, because it's not defined the __ELF__ 610 # this line is needed for QNX, because it's not defined the __ELF__
1889 have_joystick=yes 1892 have_joystick=yes
1890 fi 1893 fi
1891 CFLAGS="$save_CFLAGS" 1894 CFLAGS="$save_CFLAGS"
1892 fi 1895 fi
1893 } 1896 }
1894
1895 1897
1896 dnl Check for clock_gettime() 1898 dnl Check for clock_gettime()
1897 CheckClockGettime() 1899 CheckClockGettime()
1898 { 1900 {
1899 AC_ARG_ENABLE(clock_gettime, 1901 AC_ARG_ENABLE(clock_gettime,