From: notaz <notasas@gmail.com>
Date: Sat, 4 Aug 2012 17:53:40 +0000 (+0300)
Subject: configure: various fixes
X-Git-Tag: r16~25
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=9f7042907bbf7e1810ee8e002bc43319fbb3d0b4

configure: various fixes
---

diff --git a/configure b/configure
index 835672e4..9c059afd 100755
--- a/configure
+++ b/configure
@@ -205,15 +205,15 @@ if [ "$ARCH" = "arm" ]; then
     echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=vfp"
     echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=vfp"
   fi
-  floatabi_set_by_gcc=`$CC -v 2>&1 | grep -q -- --with-float= && echo yes`
+  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"
   fi
 
-  # must disable -mthumb as recompiler can't handle it
+  # must disable thumb as recompiler can't handle it
   if check_define __thumb__; then
-    CFLAGS="$CFLAGS -mno-thumb"
+    CFLAGS="$CFLAGS -marm"
   fi
 
   if [ "$have_armv7" = "yes" ]; then
@@ -319,12 +319,12 @@ EOF
 }
 
 MAIN_LDLIBS="$MAIN_LDLIBS -lz"
-check_zlib || fail "please install zlib/libz-dev"
+check_zlib || fail "please install zlib (libz-dev)"
 
-check_bzlib || fail "please install bz2lib/libbz2-dev"
+check_bzlib || fail "please install bz2lib (libbz2-dev)"
 
 MAIN_LDLIBS="-lpng $MAIN_LDLIBS"
-check_libpng || fail "please install libpng/libpng-dev"
+check_libpng || fail "please install libpng (libpng-dev)"
 
 # find what audio support we can compile
 if [ "x$sound_drivers" = "x" ]; then
@@ -333,7 +333,7 @@ if [ "x$sound_drivers" = "x" ]; then
     sound_drivers="$sound_drivers alsa"
     MAIN_LDLIBS="-lasound $MAIN_LDLIBS"
   fi
-  if [ "$need_sdl" == "yes" ] || check_sdl `sdl-config --cflags -libs`; then
+  if [ "$need_sdl" = "yes" ] || check_sdl `sdl-config --cflags --libs`; then
     sound_drivers="$sound_drivers sdl"
     need_sdl="yes"
   fi
@@ -347,10 +347,12 @@ else
   fi
 fi
 
-if [ "$need_sdl" == "yes" ]; then
+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 libsdl1.2-dev"
+  check_sdl || fail "please install libsdl (libsdl1.2-dev)"
 fi
 
 # check for tslib (only headers needed)
@@ -383,6 +385,13 @@ if [ "$have_arm_neon" = "yes" -a "$builtin_gpu" != "neon" ]; then
   plugins="$plugins plugins/gpu_neon/gpu_neon.so"
 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`
diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index 47b876ef..f98ae22d 100644
--- a/libpcsxcore/new_dynarec/pcsxmem.c
+++ b/libpcsxcore/new_dynarec/pcsxmem.c
@@ -15,7 +15,8 @@
 #include "pcsxmem.h"
 
 #ifdef __thumb__
-#error the dynarec does not have Thumb support, please remove -mthumb
+#error the dynarec is incompatible with Thumb functions,
+#error please add -marm to compile flags
 #endif
 
 //#define memprintf printf