initial APIC support (only for x86_64 target now)

[qemu] / configure

diff --git a/configure b/configure
index 5d7eed6..8d34921 100755 (executable)
--- a/configure
+++ b/configure
@@ -27,11 +27,14 @@ ar="ar"
 make="make"
 strip="strip"
 cpu=`uname -m`
-target_list="i386-user i386 i386-softmmu arm-user sparc-user ppc-user ppc-softmmu sparc-softmmu"
+target_list="i386-user i386 i386-softmmu arm-user armeb-user sparc-user ppc-user ppc-softmmu sparc-softmmu"
 case "$cpu" in
   i386|i486|i586|i686|i86pc|BePC)
     cpu="i386"
   ;;
+  armv4b)
+    cpu="armv4b"
+  ;;
   armv4l)
     cpu="armv4l"
   ;;
@@ -72,6 +75,11 @@ mingw32="no"
 EXESUF=""
 gdbstub="yes"
 slirp="yes"
+adlib="no"
+oss="no"
+fmod="no"
+fmod_lib=""
+fmod_inc=""
 
 # OS specific
 targetos=`uname -s`
@@ -81,18 +89,23 @@ mingw32="yes"
 ;;
 FreeBSD)
 bsd="yes"
+oss="yes"
 ;;
 NetBSD)
 bsd="yes"
+oss="yes"
 ;;
 OpenBSD)
 bsd="yes"
+oss="yes"
 ;;
 Darwin)
 bsd="yes"
 darwin="yes"
 ;;
-*) ;;
+*) 
+oss="yes"
+;;
 esac
 
 if [ "$bsd" = "yes" ] ; then
@@ -143,10 +156,18 @@ for opt do
   ;;
   --disable-sdl) sdl="no"
   ;;
+  --enable-fmod) fmod="yes"
+  ;;
+  --fmod-lib=*) fmod_lib=${opt#--fmod-lib=}
+  ;;
+  --fmod-inc=*) fmod_inc=${opt#--fmod-inc=}
+  ;;
   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
   ;; 
   --disable-slirp) slirp="no"
   ;; 
+  --enable-adlib) adlib="yes"
+  ;; 
   esac
 done
 
@@ -163,6 +184,7 @@ if test "$mingw32" = "yes" ; then
     target_list="i386-softmmu ppc-softmmu sparc-softmmu"
     EXESUF=".exe"
     gdbstub="no"
+    oss="no"
 fi
 
 if test -z "$cross_prefix" ; then
@@ -186,7 +208,7 @@ fi
 else
 
 # if cross compiling, cannot launch a program, so make a static guess
-if test "$cpu" = "powerpc" -o "$cpu" = "mips" -o "$cpu" = "s390" -o "$cpu" = "sparc" -o "$cpu" = "sparc64" -o "$cpu" = "m68k"; then
+if test "$cpu" = "powerpc" -o "$cpu" = "mips" -o "$cpu" = "s390" -o "$cpu" = "sparc" -o "$cpu" = "sparc64" -o "$cpu" = "m68k" -o "$cpu" = "armv4b"; then
     bigendian="yes"
 fi
 
@@ -275,6 +297,9 @@ echo "  --cc=CC                  use C compiler CC [$cc]"
 echo "  --make=MAKE              use specified make [$make]"
 echo "  --static                 enable static build [$static]"
 echo "  --enable-mingw32         enable Win32 cross compilation with mingw32"
+echo "  --enable-fmod            enable FMOD audio output driver"
+echo "  --fmod-lib               path to FMOD library"
+echo "  --fmod-inc               path to FMOD includes"
 echo ""
 echo "NOTE: The object files are build at the place where configure is launched"
 exit 1
@@ -316,6 +341,12 @@ echo "static build      $static"
 echo "SDL support       $sdl"
 echo "SDL static link   $sdl_static"
 echo "mingw32 support   $mingw32"
+echo "Adlib support     $adlib"
+echo -n "FMOD support      $fmod"
+if test $fmod = "yes"; then
+    echo -n " (lib='$fmod_lib' include='$fmod_inc')"
+fi
+echo ""
 
 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support"
@@ -355,6 +386,9 @@ if test "$cpu" = "i386" ; then
 elif test "$cpu" = "amd64" ; then
   echo "ARCH=amd64" >> $config_mak
   echo "#define HOST_AMD64 1" >> $config_h
+elif test "$cpu" = "armv4b" ; then
+  echo "ARCH=arm" >> $config_mak
+  echo "#define HOST_ARM 1" >> $config_h
 elif test "$cpu" = "armv4l" ; then
   echo "ARCH=arm" >> $config_mak
   echo "#define HOST_ARM 1" >> $config_h
@@ -416,6 +450,20 @@ if test "$slirp" = "yes" ; then
   echo "CONFIG_SLIRP=yes" >> $config_mak
   echo "#define CONFIG_SLIRP 1" >> $config_h
 fi
+if test "$adlib" = "yes" ; then
+  echo "CONFIG_ADLIB=yes" >> $config_mak
+  echo "#define CONFIG_ADLIB 1" >> $config_h
+fi
+if test "$oss" = "yes" ; then
+  echo "CONFIG_OSS=yes" >> $config_mak
+  echo "#define CONFIG_OSS 1" >> $config_h
+fi
+if test "$fmod" = "yes" ; then
+  echo "CONFIG_FMOD=yes" >> $config_mak
+  echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
+  echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
+  echo "#define CONFIG_FMOD 1" >> $config_h
+fi
 echo -n "VERSION=" >>$config_mak
 head $source_path/VERSION >>$config_mak
 echo "" >>$config_mak
@@ -440,6 +488,7 @@ config_mak=$target_dir/config.mak
 config_h=$target_dir/config.h
 target_cpu=`echo $target | cut -d '-' -f 1`
 target_bigendian="no"
+[ "$target_cpu" = "armeb" ] && target_bigendian=yes
 [ "$target_cpu" = "sparc" ] && target_bigendian=yes
 [ "$target_cpu" = "ppc" ] && target_bigendian=yes
 target_softmmu="no"
@@ -454,7 +503,7 @@ fi
 #echo "Creating $config_mak, $config_h and $target_dir/Makefile"
 
 mkdir -p $target_dir
-if test "$target" = "arm-user" ; then
+if test "$target" = "arm-user" -o "$target" = "armeb-user" ; then
   mkdir -p $target_dir/nwfpe
 fi
 if test "$target_user_only" = "no" ; then
@@ -477,7 +526,7 @@ if test "$target_cpu" = "i386" ; then
   echo "TARGET_ARCH=i386" >> $config_mak
   echo "#define TARGET_ARCH \"i386\"" >> $config_h
   echo "#define TARGET_I386 1" >> $config_h
-elif test "$target_cpu" = "arm" ; then
+elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then
   echo "TARGET_ARCH=arm" >> $config_mak
   echo "#define TARGET_ARCH \"arm\"" >> $config_h
   echo "#define TARGET_ARM 1" >> $config_h
@@ -510,23 +559,24 @@ fi
 
 if test "$target_user_only" = "no"; then
     if test "$target_softmmu" = "no" -o "$static" = "yes"; then
-        if test "$sdl_static" = "yes" ; then
-            echo "#define CONFIG_SDL 1" >> $config_h
-            echo "CONFIG_SDL=yes" >> $config_mak
-            echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
-        fi
+        sdl1=$sdl_static
     else
-        if test "$sdl" = "yes" ; then
-            echo "#define CONFIG_SDL 1" >> $config_h
-            echo "CONFIG_SDL=yes" >> $config_mak
+        sdl1=$sdl
+    fi
+    if test "$sdl1" = "yes" ; then
+        echo "#define CONFIG_SDL 1" >> $config_h
+        echo "CONFIG_SDL=yes" >> $config_mak
+        if test "$target_softmmu" = "no" -o "$static" = "yes"; then
+            echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
+        else
             echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
         fi
+        echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
+        if [ "${aa}" = "yes" ] ; then
+            echo -n " `aalib-config --cflags`" >> $config_mak ;
+        fi
+        echo "" >> $config_mak
     fi
-    echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
-    if [ "${aa}" = "yes" ] ; then
-        echo -n " `aalib-config --cflags`" >> $config_mak ;
-    fi
-    echo "" >> $config_mak
 fi
 
 done # for target in $targets