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

diff --git a/configure b/configure
index 7cfd626a..4ffa3a21 100755
--- a/configure
+++ b/configure
@@ -4,37 +4,57 @@ set -e
 
 TMPC="/tmp/pcsx-conf-${RANDOM}-$$-${RANDOM}.c"
 TMPO="/tmp/pcsx-conf-${RANDOM}-$$-${RANDOM}.o"
-trap "rm -f $TMPC $TMPO" EXIT INT QUIT TERM
+TMPB="/tmp/pcsx-conf-${RANDOM}-$$-${RANDOM}"
+trap "rm -f $TMPC $TMPO $TMPB" EXIT INT QUIT TERM
 rm -f config.log
 
 compile_object()
 {
-  c="$CC $CFLAGS -c $TMPC -o $TMPO $1"
+  c="$CC $CFLAGS -c $TMPC -o $TMPO $@"
+  echo $c >> config.log
+  $c >> config.log 2>&1
+}
+
+compile_binary()
+{
+  c="$CC $CFLAGS $TMPC -o $TMPB $LDFLAGS $MAIN_LDLIBS $@"
   echo $c >> config.log
   $c >> config.log 2>&1
 }
 
 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
 }
 
 # setting options to "yes" or "no" will make that choice default,
 # "" means "autodetect".
 
-platform_list="generic pandora maemo caanoo"
+platform_list="generic pandora maemo caanoo libretro"
 platform="generic"
-sound_driver_list="oss alsa none"
-sound_driver="alsa"
+builtin_gpu_list="peops unai neon"
+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"
 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"
@@ -44,8 +64,15 @@ 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 -lpthread"
 config_mak="config.mak"
 
+fail()
+{
+  echo "$@"
+  exit 1
+}
+
 # call during arg parsing, so that cmd line can override platform defaults
 set_platform()
 {
@@ -54,11 +81,12 @@ set_platform()
   generic)
     ;;
   pandora)
-    sound_driver="oss"
+    sound_drivers="oss alsa"
     ram_fixed="yes"
     drc_cache_base="yes"
     optimize_cortexa8="yes"
     have_arm_neon="yes"
+    need_xlib="yes"
     ;;
   maemo)
     ram_fixed="yes"
@@ -67,14 +95,18 @@ set_platform()
     have_arm_neon="yes"
     ;;
   caanoo)
-    sound_driver="oss"
+    sound_drivers="oss"
     ram_fixed="yes"
     drc_cache_base="yes"
     optimize_arm926ej="yes"
+    need_warm="yes"
+    ;;
+  libretro)
+    sound_drivers="libretro"
+    need_libpicofe="no"
     ;;
   *)
-    echo "unsupported platform: $platform"
-    exit 1
+    fail "unsupported platform: $platform"
     ;;
   esac
 }
@@ -86,7 +118,9 @@ for opt do
   ;;
   --platform=*) set_platform "$optarg"
   ;;
-  --sound-driver=*) sound_driver="$optarg"
+  --gpu=*) builtin_gpu="$optarg"
+  ;;
+  --sound-drivers=*) sound_drivers="$optarg"
   ;;
   --enable-neon) have_arm_neon="yes"
   ;;
@@ -104,7 +138,9 @@ if [ "$show_help" = "yes" ]; then
   echo "  --help                   print this message"
   echo "  --platform=NAME          target platform [$platform]"
   echo "                           available: $platform_list"
-  echo "  --sound-driver=NAME      sound output driver [$sound_driver]"
+  echo "  --gpu=NAME               builtin gpu plugin [guessed]"
+  echo "                           available: $builtin_gpu_list"
+  echo "  --sound-drivers=LIST     sound output drivers [guessed]"
   echo "                           available: $sound_driver_list"
   echo "  --enable-neon"
   echo "  --disable-neon           enable/disable ARM NEON optimizations [guessed]"
@@ -115,24 +151,52 @@ if [ "$show_help" = "yes" ]; then
   exit 1
 fi
 
-case "$sound_driver" in
-oss|alsa|none)
-  ;;
-*)
-  echo "unsupported sound driver: $sound_driver"
-  exit 1
-  ;;
-esac
+# validate selections
+if [ "x$builtin_gpu" != "x" ]; then
+  if ! echo $builtin_gpu_list | grep -q "\<$builtin_gpu\>"; then
+    fail "unsupported builtin gpu plugin: $builtin_gpu"
+  fi
+fi
+
+if [ "x$sound_drivers" != "x" ]; then
+  for d in $sound_drivers; do
+    if ! echo $sound_driver_list | grep -q "\<$d\>"; then
+      fail "unsupported sound driver: $sound_driver"
+    fi
+  done
+fi
+
+if [ "$need_libpicofe" = "yes" ]; then
+  if ! test -f "frontend/libpicofe/README"; then
+    fail "libpicofe is missing, please run 'git submodule init && git submodule update'"
+  fi
+fi
+
+if [ "$need_warm" = "yes" ]; then
+  if ! test -f "frontend/warm/README"; then
+    fail "wARM is missing, please run 'git submodule init && git submodule update'"
+  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
-  # both: -mfpu=neon
     CFLAGS="$CFLAGS -mcpu=cortex-a8 -mtune=cortex-a8"
     ASFLAGS="$ASFLAGS -mcpu=cortex-a8"
   fi
@@ -145,44 +209,77 @@ 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
 
-  # set mfpu and mfloat-abi if they are not set
+  if [ "x$builtin_gpu" = "x" ]; then
+    if [ "$have_arm_neon" = "yes" ]; then
+      builtin_gpu="neon"
+    elif [ "$have_armv7" != "yes" ]; then
+      # pre-ARMv7 hardware is usually not fast enough for peops
+      builtin_gpu="unai"
+    else
+      builtin_gpu="peops"
+    fi
+  fi
+
+  # 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
-  if [ "$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
 
-  if [ "$have_armv7" = "yes" ]; then
-    ASFLAGS="$ASFLAGS --defsym HAVE_ARMV7=1"
-  else
-    ASFLAGS="$ASFLAGS --defsym HAVE_ARMV7=0"
+  # must disable thumb as recompiler can't handle it
+  if check_define __thumb__; then
+    CFLAGS="$CFLAGS -marm"
   fi
-else
+
+  # 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
+  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 [ "$ARCH" = "x86_64" ]; then
-  # currently we are full of 32bit assumptions,
-  # at least savestate compatibility will break without these
-  CFLAGS="$CFLAGS -m32"
-  LDFLAGS="$LDFLAGS -m32"
+if [ "x$builtin_gpu" = "x" ]; then
+  builtin_gpu="peops"
 fi
 
 # supposedly we can avoid -fPIC on armv5 for slightly better performace?
@@ -194,16 +291,135 @@ if [ "$ram_fixed" = "yes" ]; then
   CFLAGS="$CFLAGS -DRAM_FIXED"
 fi
 
-if [ "$platform" = "generic" ]; then
-  generic_cflags=`sdl-config --cflags`
-  generic_ldlibs=`sdl-config --libs`
-  CFLAGS="$CFLAGS $generic_cflags"
-  LDFLAGS="$LDFLAGS $generic_ldlibs"
-elif [ "$platform" = "maemo" ]; then
-  maemo_cflags=`pkg-config --cflags hildon-1`
-  maemo_ldlibs=`pkg-config --libs hildon-1`
-  CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES $maemo_cflags"
-  LDFLAGS="$LDFLAGS $maemo_ldlibs"
+case "$platform" in
+generic)
+  need_sdl="yes"
+  ;;
+maemo)
+  CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES"
+  ;;
+libretro)
+  CFLAGS="$CFLAGS -fPIC"
+  MAIN_LDFLAGS="$MAIN_LDFLAGS -shared -Wl,--no-undefined"
+  ;;
+esac
+
+# header/library presence tests
+check_zlib()
+{
+  cat > $TMPC <<EOF
+  #include <zlib.h>
+  int main(void) { uncompress(0, 0, 0, 0); }
+EOF
+  compile_binary
+}
+
+check_libpng()
+{
+  cat > $TMPC <<EOF
+  #include <png.h>
+  void main() { png_init_io(0, 0); }
+EOF
+  compile_binary
+}
+
+check_oss()
+{
+  cat > $TMPC <<EOF
+  #include <sys/soundcard.h>
+  #include <sys/ioctl.h>
+  void main() { int a=0; ioctl(0, SNDCTL_DSP_SETFMT, &a); }
+EOF
+  compile_binary
+}
+
+check_alsa()
+{
+  cat > $TMPC <<EOF
+  #include <alsa/asoundlib.h>
+  void main() { snd_pcm_open(0, 0, 0, 0); }
+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
+  #include <SDL.h>
+  void main() { SDL_OpenAudio(0, 0); }
+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)"
+
+MAIN_LDLIBS="-lpng $MAIN_LDLIBS"
+check_libpng || fail "please install libpng (libpng-dev)"
+
+# find what audio support we can compile
+if [ "x$sound_drivers" = "x" ]; then
+  if check_oss; then sound_drivers="$sound_drivers oss"; fi
+  if check_alsa -lasound; 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"
+  fi
+else
+  if echo $sound_drivers | grep -q "\<oss\>"; then
+    check_oss || fail "oss support is missing"
+  fi
+  if echo $sound_drivers | grep -q "\<alsa\>"; then
+    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
+  which sdl-config > /dev/null || \
+    fail "sdl-config is missing; please install libsdl (libsdl1.2-dev)"
+  CFLAGS="$CFLAGS `sdl-config --cflags`"
+  MAIN_LDLIBS="`sdl-config --libs` $MAIN_LDLIBS"
+  check_sdl || fail "please install libsdl (libsdl1.2-dev)"
 fi
 
 # check for tslib (only headers needed)
@@ -219,21 +435,87 @@ 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 <EGL/egl.h>
+int main(void) {
+  return (int)eglGetDisplay( (EGLNativeDisplayType)0 );
+}
+EOF
+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
+if compile_object -Wno-unused-result; then
+  CFLAGS="$CFLAGS -Wno-unused-result"
+fi
+
+# short plugin list for display
+for p in $plugins; do
+  p1=`basename $p`
+  plugins_short="$p1 $plugins_short"
+done
+
 # set things that failed to autodetect to "no"
 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"
-echo "sound driver        $sound_driver"
+echo "built-in GPU        $builtin_gpu"
+echo "sound drivers       $sound_drivers"
+echo "plugins             $plugins_short"
 echo "C compiler          $CC"
 echo "C compiler flags    $CFLAGS"
-echo "linker flags        $LDFLAGS"
+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
@@ -246,40 +528,41 @@ echo "AS = $AS" >> $config_mak
 echo "CFLAGS += $CFLAGS" >> $config_mak
 echo "ASFLAGS += $ASFLAGS" >> $config_mak
 echo "LDFLAGS += $LDFLAGS" >> $config_mak
-echo "LDLIBS += $LDLIBS" >> $config_mak
+echo "MAIN_LDFLAGS += $MAIN_LDFLAGS" >> $config_mak
+echo "MAIN_LDLIBS += $MAIN_LDLIBS" >> $config_mak
 echo "PLUGIN_CFLAGS += $PLUGIN_CFLAGS" >> $config_mak
 echo >> $config_mak
 
+if [ "$platform" = "libretro" ]; then
+  echo "TARGET = libretro.so" >> $config_mak
+fi
 echo "ARCH = $ARCH" >> $config_mak
 echo "PLATFORM = $platform" >> $config_mak
-case "$sound_driver" in
-oss)
-  echo "USE_OSS = 1" >> $config_mak
-  ;;
-alsa)
-  echo "USE_ALSA = 1" >> $config_mak
-  ;;
-none)
-  echo "USE_NO_SOUND = 1" >> $config_mak
-  ;;
-esac
-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 "BUILTIN_GPU = $builtin_gpu" >> $config_mak
+echo "SOUND_DRIVERS = $sound_drivers" >> $config_mak
+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
 
 # vim:shiftwidth=2:expandtab