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

diff --git a/configure b/configure
index 42ab9f5c..f55e9b65 100755
--- a/configure
+++ b/configure
@@ -46,10 +46,13 @@ have_armv6=""
 have_armv7=""
 have_arm_neon=""
 have_tslib=""
+have_gles=""
 enable_dynarec="yes"
 need_sdl="no"
 need_libpicofe="yes"
 need_warm="no"
+CFLAGS_GLES=""
+LDLIBS_GLES=""
 # these are for known platforms
 optimize_cortexa8="no"
 optimize_arm926ej="no"
@@ -215,28 +218,24 @@ 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
   if check_define __thumb__; then
     CFLAGS="$CFLAGS -marm"
   fi
-
-  if [ "$have_armv7" = "yes" ]; then
-    ASFLAGS="$ASFLAGS --defsym HAVE_ARMV7=1"
-  else
-    ASFLAGS="$ASFLAGS --defsym HAVE_ARMV7=0"
-  fi
 else
   # dynarec only available on ARM
   enable_dynarec="no"
@@ -281,15 +280,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
@@ -330,8 +320,6 @@ EOF
 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)"
 
@@ -377,19 +365,31 @@ 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"
+  LDLIBS_GLES="$LDLIBS_GLES -L/opt/vc/lib"
+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 [ "$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
@@ -425,6 +425,9 @@ echo "enable dynarec      $enable_dynarec"
 echo "ARMv7 optimizations $have_armv7"
 echo "enable ARM NEON     $have_arm_neon"
 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,27 +452,18 @@ 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