X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=configure;h=4d9b566c59183a05e2e32edbf696e85d9a232dc2;hp=cb124ac6d6c80c69fa5d1fdb0dc3b50cc519abff;hb=HEAD;hpb=3d037671fa024a16ea55f029b5c83cca8021f9ea

diff --git a/configure b/configure
index cb124ac6..ac7af0e2 100755
--- a/configure
+++ b/configure
@@ -39,17 +39,18 @@ check_define_val()
 
 platform_list="generic pandora maemo caanoo libretro"
 platform="generic"
-builtin_gpu_list="peops unai neon senquack"
+builtin_gpu_list="neon peops unai unai_old"
 builtin_gpu=""
 sound_driver_list="oss alsa pulseaudio sdl libretro"
 sound_drivers=""
 plugins="plugins/spunull/spunull.so \
-plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so plugins/gpu_senquack/gpu_senquack.so"
+plugins/dfxvideo/gpu_peops.so plugins/gpu_unai_old/gpu_unai_old.so plugins/gpu_unai/gpu_unai.so"
 drc_cache_base="no"
 have_armv5=""
 have_armv6=""
 have_armv7=""
 have_arm_neon=""
+have_arm_neon_asm=""
 have_tslib=""
 have_gles=""
 have_c64x_dsp=""
@@ -65,15 +66,27 @@ optimize_cortexa8="no"
 optimize_arm926ej="no"
 
 # hardcoded stuff
-CC="${CC-${CROSS_COMPILE}gcc}"
-CXX="${CXX-${CROSS_COMPILE}g++}"
+if [ "${OSTYPE}" = "FreeBSD" ]; then
+	CC="clang"
+	CXX="clang++"
+	CFLAGS="-I/usr/local/include -L/usr/local/lib"
+	MAKE=gmake
+else
+	CC="${CC-${CROSS_COMPILE}gcc}"
+	CXX="${CXX-${CROSS_COMPILE}g++}"
+fi
 AS="${AS-${CROSS_COMPILE}as}"
 AR="${AS-${CROSS_COMPILE}ar}"
 MAIN_LDLIBS="$LDLIBS -ldl -lm -lpthread"
 config_mak="config.mak"
 
-SYSROOT="$(${CC} --print-sysroot)"
-[ "x${SDL_CONFIG}" = "x" ] && SDL_CONFIG="${SYSROOT}/usr/bin/sdl-config"
+if [ "${OSTYPE}" = "FreeBSD" ]; then
+	SYSROOT="$sysroot"
+	[ "x${SDL_CONFIG}" = "x" ] && SDL_CONFIG="${SYSROOT}/usr/local/bin/sdl-config"
+else
+	SYSROOT="$(${CC} --print-sysroot)"
+	[ "x${SDL_CONFIG}" = "x" ] && SDL_CONFIG="${SYSROOT}/usr/bin/sdl-config"
+fi
 
 fail()
 {
@@ -152,7 +165,6 @@ if [ "$show_help" = "yes" ]; then
   echo "  --disable-neon           enable/disable ARM NEON optimizations [guessed]"
   echo "  --disable-dynarec        disable dynamic recompiler"
   echo "                           (dynarec is only available and enabled on ARM)"
-  echo "  --disable-icache-emu     Disables the instruction cache emulation"
   echo "influential environment variables:"
   echo "  CROSS_COMPILE CC CXX AS AR CFLAGS ASFLAGS LDFLAGS LDLIBS"
   exit 1
@@ -213,7 +225,7 @@ arm*)
   fi
 
   if [ "x$have_arm_neon" = "x" ]; then
-    # detect NEON from user-supplied cflags to enable asm code
+    # detect NEON from user-supplied cflags to enable neon code
     have_arm_neon=`check_define __ARM_NEON__ && echo yes` || true
   fi
   if [ "x$have_armv7" = "x" ]; then
@@ -238,7 +250,7 @@ arm*)
       builtin_gpu="neon"
     elif [ "$have_armv7" != "yes" ]; then
       # pre-ARMv7 hardware is usually not fast enough for peops
-      builtin_gpu="unai"
+      builtin_gpu="unai_old"
     else
       builtin_gpu="peops"
     fi
@@ -278,8 +290,20 @@ arm*)
     echo "You probably want to specify -mcpu= or -march= like this:"
     echo "  CFLAGS=-march=armv7-a ./configure ..."
   fi
+  have_arm_neon_asm=$have_arm_neon
   ;;
 aarch64)
+  have_arm_neon="yes"
+  have_arm_neon_asm="no"
+  if [ "x$builtin_gpu" = "x" ]; then
+    builtin_gpu="neon"
+  fi
+  ;;
+x86_64)
+  enable_dynarec="no"
+  if [ "x$builtin_gpu" = "x" ]; then
+    builtin_gpu="neon"
+  fi
   ;;
 *)
   # dynarec only available on ARM
@@ -508,6 +532,7 @@ done
 test "x$have_armv6" != "x" || have_armv6="no"
 test "x$have_armv7" != "x" || have_armv7="no"
 test "x$have_arm_neon" != "x" || have_arm_neon="no"
+test "x$have_arm_neon_asm" != "x" || have_arm_neon_asm="no"
 test "x$have_gles" != "x" || have_gles="no"
 test "x$have_c64x_dsp" != "x" || have_c64x_dsp="no"
 
@@ -521,9 +546,11 @@ echo "C compiler flags    $CFLAGS"
 echo "libraries           $MAIN_LDLIBS"
 echo "linker flags        $LDFLAGS$MAIN_LDFLAGS"
 echo "enable dynarec      $enable_dynarec"
+if [ "$ARCH" = "arm" -o "$ARCH" = "aarch64" ]; then
+  echo "enable ARM NEON     $have_arm_neon"
+fi
 if [ "$ARCH" = "arm" ]; then
   echo "ARMv7 optimizations $have_armv7"
-  echo "enable ARM NEON     $have_arm_neon"
   echo "TI C64x DSP support $have_c64x_dsp"
 fi
 echo "tslib support       $have_tslib"
@@ -558,6 +585,9 @@ echo "PLUGINS = $plugins" >> $config_mak
 if [ "$have_arm_neon" = "yes" ]; then
   echo "HAVE_NEON = 1" >> $config_mak
 fi
+if [ "$have_arm_neon_asm" = "yes" ]; then
+  echo "HAVE_NEON_ASM = 1" >> $config_mak
+fi
 if [ "$have_tslib" = "yes" ]; then
   echo "HAVE_TSLIB = 1" >> $config_mak
 fi