X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=configure;h=4ffa3a2150da1d8b9f2c38038abc02c03dcd154b;hp=42ab9f5cf6d339708decb12026ea21c55df294fe;hb=ba10822d813767632c528102055e3eeb54730b2c;hpb=8e1040b6a82ee1802fda83d4de84290a02656cc0

diff --git a/configure b/configure
index 42ab9f5c..4ffa3a21 100755
--- a/configure
+++ b/configure
@@ -24,8 +24,7 @@ compile_binary()
 
 check_define()
 {
-  echo "" > $TMPC
-  $CC -E -dD $CFLAGS $TMPC | grep -q $1 || return 1
+  $CC -E -dD $CFLAGS include/arm_features.h | grep -q $1 || return 1
   return 0
 }
 
@@ -36,20 +35,26 @@ platform_list="generic pandora maemo caanoo libretro"
 platform="generic"
 builtin_gpu_list="peops unai neon"
 builtin_gpu=""
-sound_driver_list="oss alsa sdl pulseaudio libretro"
+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"
 ram_fixed="no"
 drc_cache_base="no"
+have_armv5=""
 have_armv6=""
 have_armv7=""
 have_arm_neon=""
 have_tslib=""
+have_gles=""
+have_c64x_dsp=""
 enable_dynarec="yes"
 need_sdl="no"
+need_xlib="no"
 need_libpicofe="yes"
 need_warm="no"
+CFLAGS_GLES=""
+LDLIBS_GLES=""
 # these are for known platforms
 optimize_cortexa8="no"
 optimize_arm926ej="no"
@@ -59,7 +64,7 @@ CC="${CC-${CROSS_COMPILE}gcc}"
 CXX="${CXX-${CROSS_COMPILE}g++}"
 AS="${AS-${CROSS_COMPILE}as}"
 AR="${AS-${CROSS_COMPILE}ar}"
-MAIN_LDLIBS="$LDLIBS -ldl -lm"
+MAIN_LDLIBS="$LDLIBS -ldl -lm -lpthread"
 config_mak="config.mak"
 
 fail()
@@ -81,6 +86,7 @@ set_platform()
     drc_cache_base="yes"
     optimize_cortexa8="yes"
     have_arm_neon="yes"
+    need_xlib="yes"
     ;;
   maemo)
     ram_fixed="yes"
@@ -172,13 +178,24 @@ if [ "$need_warm" = "yes" ]; then
   fi
 fi
 
+# basic compiler test
+cat > $TMPC <<EOF
+#include <zlib.h>
+int main(void) { return 0; }
+EOF
+if ! compile_binary; then
+  fail "compiler test failed, please check config.log"
+fi
+
 if [ -z "$ARCH" ]; then
-  ARCH=`$CC -v 2>&1 | grep -i 'target:' | awk '{print $2}' \
-        | awk -F '-' '{print $1}'`
+  ARCH=`$CC -dumpmachine | awk -F '-' '{print $1}'`
 fi
 
-# ARM stuff
-if [ "$ARCH" = "arm" ]; then
+case "$ARCH" in
+arm*)
+  # ARM stuff
+  ARCH="arm"
+
   if [ "$optimize_cortexa8" = "yes" ]; then
     CFLAGS="$CFLAGS -mcpu=cortex-a8 -mtune=cortex-a8"
     ASFLAGS="$ASFLAGS -mcpu=cortex-a8"
@@ -192,15 +209,22 @@ if [ "$ARCH" = "arm" ]; then
     # detect NEON from user-supplied cflags to enable asm code
     have_arm_neon=`check_define __ARM_NEON__ && echo yes` || true
   fi
-  if [ "x$have_armv6" = "x" ]; then
-    have_armv6=`check_define __ARM_ARCH_6 && echo yes` || true
-  fi
   if [ "x$have_armv7" = "x" ]; then
-    if check_define __ARM_ARCH_7A__; then
-      have_armv6="yes"
+    if check_define HAVE_ARMV7; then
       have_armv7="yes"
+      have_armv6="yes"
+      have_armv5="yes"
+    fi
+  fi
+  if [ "x$have_armv6" = "x" ]; then
+    if check_define HAVE_ARMV6; then
+      have_armv6="yes"
+      have_armv5="yes"
     fi
   fi
+  if [ "x$have_armv5" = "x" ]; then
+    have_armv5=`check_define HAVE_ARMV5 && echo yes` || true
+  fi
 
   if [ "x$builtin_gpu" = "x" ]; then
     if [ "$have_arm_neon" = "yes" ]; then
@@ -215,16 +239,18 @@ if [ "$ARCH" = "arm" ]; then
 
   # automatically set mfpu and mfloat-abi if they are not set
   if [ "$have_arm_neon" = "yes" ]; then
-    echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=neon"
-    echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=neon"
+    fpu="neon"
   elif [ "$have_armv6" = "yes" ]; then
-    echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=vfp"
-    echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=vfp"
+    fpu="vfp"
   fi
-  floatabi_set_by_gcc=`$CC -v 2>&1 | grep -q -- --with-float= && echo yes` || true
-  if [ "$floatabi_set_by_gcc" != "yes" -a "$have_armv6" = "yes" ]; then
-    echo "$CFLAGS" | grep -q -- '-mfloat-abi=' || CFLAGS="$CFLAGS -mfloat-abi=softfp"
-    echo "$ASFLAGS" | grep -q -- '-mfloat-abi=' || ASFLAGS="$ASFLAGS -mfloat-abi=softfp"
+  if [ "x$fpu" != "x" ]; then
+    echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=$fpu"
+    echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=$fpu"
+    floatabi_set_by_gcc=`$CC -v 2>&1 | grep -q -- --with-float= && echo yes` || true
+    if [ "$floatabi_set_by_gcc" != "yes" ]; then
+      echo "$CFLAGS" | grep -q -- '-mfloat-abi=' || CFLAGS="$CFLAGS -mfloat-abi=softfp"
+      echo "$ASFLAGS" | grep -q -- '-mfloat-abi=' || ASFLAGS="$ASFLAGS -mfloat-abi=softfp"
+    fi
   fi
 
   # must disable thumb as recompiler can't handle it
@@ -232,15 +258,25 @@ if [ "$ARCH" = "arm" ]; then
     CFLAGS="$CFLAGS -marm"
   fi
 
-  if [ "$have_armv7" = "yes" ]; then
-    ASFLAGS="$ASFLAGS --defsym HAVE_ARMV7=1"
-  else
-    ASFLAGS="$ASFLAGS --defsym HAVE_ARMV7=0"
+  # warn about common mistakes
+  if [ "$have_armv5" != "yes" ]; then
+    if ! echo "$CFLAGS" | grep -q -- '-mcpu=\|-march='; then
+      echo "Warning: compiling for ARMv4, is that really what you want?"
+      echo "You probably should specify -mcpu= or -march= like this:"
+      echo "  CFLAGS=-march=armv6 ./configure ..."
+    fi
   fi
-else
+  if [ "$have_arm_neon" = "yes" -a "$have_armv7" != "yes" ]; then
+    echo "Warning: compiling for NEON, but not ARMv7?"
+    echo "You probably want to specify -mcpu= or -march= like this:"
+    echo "  CFLAGS=-march=armv7-a ./configure ..."
+  fi
+  ;;
+*)
   # dynarec only available on ARM
   enable_dynarec="no"
-fi
+  ;;
+esac
 
 if [ "x$builtin_gpu" = "x" ]; then
   builtin_gpu="peops"
@@ -260,10 +296,7 @@ generic)
   need_sdl="yes"
   ;;
 maemo)
-  maemo_cflags=`pkg-config --cflags hildon-1`
-  maemo_ldlibs=`pkg-config --libs hildon-1`
-  CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES $maemo_cflags"
-  MAIN_LDLIBS="$MAIN_LDLIBS $maemo_ldlibs"
+  CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES"
   ;;
 libretro)
   CFLAGS="$CFLAGS -fPIC"
@@ -281,15 +314,6 @@ EOF
   compile_binary
 }
 
-check_bzlib()
-{
-  cat > $TMPC <<EOF
-  #include <bzlib.h>
-  void main() { BZ2_bzBuffToBuffDecompress(0, 0, 0, 0, 0, 0); }
-EOF
-  compile_object
-}
-
 check_libpng()
 {
   cat > $TMPC <<EOF
@@ -318,6 +342,15 @@ EOF
   compile_binary "$@"
 }
 
+check_pulseaudio()
+{
+  cat > $TMPC <<EOF
+  #include <pulse/pulseaudio.h>
+  void main() { pa_threaded_mainloop_new(); }
+EOF
+  compile_binary "$@"
+}
+
 check_sdl()
 {
   cat > $TMPC <<EOF
@@ -327,11 +360,28 @@ EOF
   compile_binary "$@"
 }
 
+check_xlib_headers()
+{
+  cat > $TMPC <<EOF
+  #include <X11/Xlib.h>
+  void *f() { return XOpenDisplay(0); }
+EOF
+  compile_object "$@"
+}
+
+# see if we have c64_tools for TI C64x DSP
+check_c64_tools()
+{
+  cat > $TMPC <<EOF
+  #include <inc_libc64_mini.h>
+  int f() { return dsp_open(); }
+EOF
+  compile_object "$@"
+}
+
 MAIN_LDLIBS="$MAIN_LDLIBS -lz"
 check_zlib || fail "please install zlib (libz-dev)"
 
-check_bzlib || fail "please install bz2lib (libbz2-dev)"
-
 MAIN_LDLIBS="-lpng $MAIN_LDLIBS"
 check_libpng || fail "please install libpng (libpng-dev)"
 
@@ -342,6 +392,10 @@ if [ "x$sound_drivers" = "x" ]; then
     sound_drivers="$sound_drivers alsa"
     MAIN_LDLIBS="-lasound $MAIN_LDLIBS"
   fi
+  if check_pulseaudio -lpulse; then
+    sound_drivers="$sound_drivers pulseaudio"
+    MAIN_LDLIBS="-lpulse $MAIN_LDLIBS"
+  fi
   if [ "$need_sdl" = "yes" ] || check_sdl `sdl-config --cflags --libs`; then
     sound_drivers="$sound_drivers sdl"
     need_sdl="yes"
@@ -354,6 +408,10 @@ else
     MAIN_LDLIBS="-lasound $MAIN_LDLIBS"
     check_alsa || fail "please install libasound2-dev"
   fi
+  if echo $sound_drivers | grep -q "\<pulseaudio\>"; then
+    MAIN_LDLIBS="-lpulse $MAIN_LDLIBS"
+    check_pulseaudio || fail "pulseaudio support is missing"
+  fi
 fi
 
 if [ "$need_sdl" = "yes" ]; then
@@ -377,23 +435,48 @@ EOF
   fi
 fi
 
+# check for VideoCore stuff for Raspberry Pi
+if [ -d /opt/vc/include -a -d /opt/vc/lib ]; then
+  CFLAGS_GLES="$CFLAGS_GLES -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
+  LDLIBS_GLES="$LDLIBS_GLES -L/opt/vc/lib"
+  if [ -f /opt/vc/lib/libbcm_host.so ]; then
+    LDLIBS_GLES="$LDLIBS_GLES -lbcm_host"
+  fi
+  need_xlib="yes"
+fi
+
 # check for GLES headers
 cat > $TMPC <<EOF
 #include <GLES/gl.h>
-#include <GLES/glext.h>
 #include <EGL/egl.h>
-void *test(void) {
-  return eglGetDisplay( (EGLNativeDisplayType)0 );
+int main(void) {
+  return (int)eglGetDisplay( (EGLNativeDisplayType)0 );
 }
 EOF
-if compile_object; then
-  plugins="$plugins plugins/gpu-gles/gpu_gles.so"
+if compile_binary $CFLAGS_GLES -lEGL -lGLES_CM $LDLIBS_GLES; then
+  have_gles="yes"
+  LDLIBS_GLES="-lEGL -lGLES_CM $LDLIBS_GLES"
+elif compile_binary $CFLAGS_GLES -lEGL -lGLESv1_CM $LDLIBS_GLES; then
+  have_gles="yes"
+  LDLIBS_GLES="-lEGL -lGLESv1_CM $LDLIBS_GLES"
 fi
 
+if check_c64_tools; then
+  have_c64x_dsp="yes"
+fi
+
+if [ "$have_gles" = "yes" ]; then
+  plugins="$plugins plugins/gpu-gles/gpu_gles.so"
+fi
 if [ "$have_arm_neon" = "yes" -a "$builtin_gpu" != "neon" ]; then
   plugins="$plugins plugins/gpu_neon/gpu_neon.so"
 fi
 
+# check for xlib (only headers needed)
+if [ "x$need_xlib" = "xyes" ]; then
+  check_xlib_headers || fail "please install libx11-dev"
+fi
+
 cat > $TMPC <<EOF
 void test(void *f, void *d) { fread(d, 1, 1, f); }
 EOF
@@ -411,6 +494,8 @@ 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_gles" != "x" || have_gles="no"
+test "x$have_c64x_dsp" != "x" || have_c64x_dsp="no"
 
 echo "architecture        $ARCH"
 echo "platform            $platform"
@@ -422,9 +507,15 @@ echo "C compiler flags    $CFLAGS"
 echo "libraries           $MAIN_LDLIBS"
 echo "linker flags        $LDFLAGS$MAIN_LDFLAGS"
 echo "enable dynarec      $enable_dynarec"
-echo "ARMv7 optimizations $have_armv7"
-echo "enable ARM NEON     $have_arm_neon"
+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"
+if [ "$platform" = "generic" ]; then
+  echo "OpenGL ES output    $have_gles"
+fi
 
 echo "# Automatically generated by configure" > $config_mak
 printf "# Configured with:" >> $config_mak
@@ -449,33 +540,27 @@ echo "ARCH = $ARCH" >> $config_mak
 echo "PLATFORM = $platform" >> $config_mak
 echo "BUILTIN_GPU = $builtin_gpu" >> $config_mak
 echo "SOUND_DRIVERS = $sound_drivers" >> $config_mak
-if [ "$ARCH" = "arm" ]; then
-  echo "PLUGINS = $plugins" >> $config_mak
-else
-  echo -n "PLUGINS =" >> $config_mak
-  for p in $plugins; do
-    echo -n " ${p}.${ARCH}" >> $config_mak
-  done
-  echo >> $config_mak
-fi
-if [ "$have_armv6" = "yes" ]; then
-  echo "HAVE_ARMV6 = 1" >> $config_mak
-fi
-if [ "$have_armv7" = "yes" ]; then
-  echo "HAVE_ARMV7 = 1" >> $config_mak
-fi
+echo "PLUGINS = $plugins" >> $config_mak
 if [ "$have_arm_neon" = "yes" ]; then
   echo "HAVE_NEON = 1" >> $config_mak
 fi
 if [ "$have_tslib" = "yes" ]; then
   echo "HAVE_TSLIB = 1" >> $config_mak
 fi
+if [ "$have_gles" = "yes" ]; then
+  echo "HAVE_GLES = 1" >> $config_mak
+  echo "CFLAGS_GLES = $CFLAGS_GLES" >> $config_mak
+  echo "LDLIBS_GLES = $LDLIBS_GLES" >> $config_mak
+fi
 if [ "$enable_dynarec" = "yes" ]; then
   echo "USE_DYNAREC = 1" >> $config_mak
 fi
 if [ "$drc_cache_base" = "yes" ]; then
   echo "DRC_CACHE_BASE = 1" >> $config_mak
 fi
+if [ "$have_c64x_dsp" = "yes" ]; then
+  echo "HAVE_C64_TOOLS = 1" >> $config_mak
+fi
 
 # use pandora's skin (for now)
 test -e skin || ln -s frontend/pandora/skin skin