Mercurial > sdl-ios-xcode
comparison configure.in @ 4538:74b5387da0c4 SDL-1.2
Debian patch: 011_no_yasm.diff
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sun, 18 Jul 2010 07:54:00 -0700 |
parents | 725e506f6243 |
children |
comparison
equal
deleted
inserted
replaced
4442:31b0f2e06e3c | 4538:74b5387da0c4 |
---|---|
743 NASMFLAGS="-f elf" | 743 NASMFLAGS="-f elf" |
744 ;; | 744 ;; |
745 esac | 745 esac |
746 fi | 746 fi |
747 | 747 |
748 AC_PATH_PROG(NASM, yasm) | 748 AC_PATH_PROG(NASM, nasm) |
749 echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections | 749 echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections |
750 echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections | 750 echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections |
751 echo "%endif" >> unquoted-sections | 751 echo "%endif" >> unquoted-sections |
752 CompileNASM unquoted-sections || NASM="" | 752 CompileNASM unquoted-sections || NASM="" |
753 | 753 |
754 if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then | |
755 $as_unset ac_cv_path_NASM | |
756 AC_PATH_PROG(NASM, nasm) | |
757 fi | |
758 if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then | 754 if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then |
759 AC_DEFINE(SDL_HERMES_BLITTERS) | 755 AC_DEFINE(SDL_HERMES_BLITTERS) |
760 SOURCES="$SOURCES $srcdir/src/hermes/*.asm" | 756 SOURCES="$SOURCES $srcdir/src/hermes/*.asm" |
761 NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/" | 757 NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/" |
762 | 758 |