equal
deleted
inserted
replaced
594 dnl Check for NASM (for assembly blit routines) |
594 dnl Check for NASM (for assembly blit routines) |
595 AC_ARG_ENABLE(nasm, |
595 AC_ARG_ENABLE(nasm, |
596 AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]), |
596 AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]), |
597 , enable_nasm=yes) |
597 , enable_nasm=yes) |
598 if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then |
598 if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then |
599 AC_PATH_PROG(NASM, nasm) |
599 AC_PATH_PROG(NASM, yasm) |
600 if test x$NASM != x -a x$NASM != x'"$NASM"'; then |
600 if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then |
|
601 AC_PATH_PROG(NASM, nasm) |
|
602 fi |
|
603 if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then |
601 AC_DEFINE(SDL_HERMES_BLITTERS) |
604 AC_DEFINE(SDL_HERMES_BLITTERS) |
602 SOURCES="$SOURCES $srcdir/src/hermes/*.asm" |
605 SOURCES="$SOURCES $srcdir/src/hermes/*.asm" |
603 if test x$NASMFLAGS = x; then |
606 if test x"$NASMFLAGS" = x; then |
604 case $ARCH in |
607 case $ARCH in |
605 win32) |
608 win32) |
606 NASMFLAGS="-f win32" |
609 NASMFLAGS="-f win32" |
607 ;; |
610 ;; |
608 openbsd) |
611 openbsd) |
611 *) |
614 *) |
612 NASMFLAGS="-f elf" |
615 NASMFLAGS="-f elf" |
613 ;; |
616 ;; |
614 esac |
617 esac |
615 fi |
618 fi |
|
619 NASMFLAGS="$NASMFLAGS -i $srcdir/src/hermes/" |
|
620 |
|
621 dnl See if hidden visibility is supported |
|
622 echo 'GLOBAL _bar:function hidden' > nasm_vis.asm |
|
623 if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD ; then |
|
624 NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY" |
|
625 fi |
|
626 rm -f nasm_vis.asm nasm_vis.o |
|
627 |
616 AC_SUBST(NASM) |
628 AC_SUBST(NASM) |
617 AC_SUBST(NASMFLAGS) |
629 AC_SUBST(NASMFLAGS) |
618 |
630 |
619 case "$host" in |
631 case "$host" in |
620 # this line is needed for QNX, because it's not defined the __ELF__ |
632 # this line is needed for QNX, because it's not defined the __ELF__ |