qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 15:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable svga support when not building for 32-bit x86 (for now, anyway).

Browse source
This commit is contained in:
Bill Currie 2010-08-05 01:58:39 +00:00 committed by Jeff Teunissen
parent 3e0aaea535
commit 96a507e8ea
1 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
configure.ac
View file

@ -81,6 +81,24 @@ case "$host_os" in
;; ;;
esac esac
dnl Check for ia32
AC_MSG_CHECKING(for an ia32 machine)
case "${target}" in
i?86-*-*)
AC_MSG_RESULT(yes)
AC_MSG_CHECKING(to see if we should disable asm optimizations)
AC_ARG_ENABLE(asmopt,
[ --disable-asmopt disable assembler optimization],
AC_MSG_RESULT(yes),
AC_DEFINE(USE_INTEL_ASM, 1, [Define this if you want to use Intel assembly optimizations])
ASM_ARCH=yes
AC_MSG_RESULT(no)
)
;;
*) AC_MSG_RESULT(no)
esac
AM_CONDITIONAL(ASM_ARCH, test "x$ASM_ARCH" = "xyes")
dnl ================================================================== dnl ==================================================================
dnl Checks for programs. dnl Checks for programs.
dnl ================================================================== dnl ==================================================================
@ -760,14 +778,20 @@ if test "x$HAVE_SVGA" != xno; then
AC_CHECK_HEADER(vga.h, HAVE_SVGA=yes, HAVE_SVGA=no) AC_CHECK_HEADER(vga.h, HAVE_SVGA=yes, HAVE_SVGA=no)
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
dnl Make sure -lvga works if test "x$ASM_ARCH" = xyes; then
if test "x$HAVE_SVGA" = xyes; then dnl Make sure -lvga works
AC_CHECK_LIB(vga, vga_getmousetype, SVGA_LIBS="$SVGA_LIBS -lvga" if test "x$HAVE_SVGA" = xyes; then
HAVE_SVGA=yes, HAVE_SVGA=no, [$SVGA_LIBS] AC_CHECK_LIB(vga, vga_getmousetype, SVGA_LIBS="$SVGA_LIBS -lvga"
) HAVE_SVGA=yes, HAVE_SVGA=no, [$SVGA_LIBS]
fi )
if test "x$HAVE_SVGA" != xyes; then fi
SVGA_CFLAGS="" SVGA_LIBS="" if test "x$HAVE_SVGA" != xyes; then
SVGA_CFLAGS="" SVGA_LIBS=""
fi
else
HAVE_SVGA=no
SVGA_CFLAGS=
SVGA_LIBS=
fi fi
fi fi
AC_SUBST(HAVE_SVGA) AC_SUBST(HAVE_SVGA)
@ -924,24 +948,6 @@ esac
AM_CONDITIONAL(SYSTYPE_WIN32, test "x$SYSTYPE" = "xWIN32") AM_CONDITIONAL(SYSTYPE_WIN32, test "x$SYSTYPE" = "xWIN32")
AC_SUBST(WIN32_LIBS) AC_SUBST(WIN32_LIBS)
dnl Check for ia32
AC_MSG_CHECKING(for an ia32 machine)
case "${host}" in
i?86-*-*)
AC_MSG_RESULT(yes)
AC_MSG_CHECKING(to see if we should disable asm optimizations)
AC_ARG_ENABLE(asmopt,
[ --disable-asmopt disable assembler optimization],
AC_MSG_RESULT(yes),
AC_DEFINE(USE_INTEL_ASM, 1, [Define this if you want to use Intel assembly optimizations])
ASM_ARCH=yes
AC_MSG_RESULT(no)
)
;;
*) AC_MSG_RESULT(no)
esac
AM_CONDITIONAL(ASM_ARCH, test "x$ASM_ARCH" = "xyes")
dnl ================================================================== dnl ==================================================================
dnl Checks for sound dnl Checks for sound
dnl ================================================================== dnl ==================================================================