Commit 1a73b4eba2c96447bb6bad86b7e03e64206fd2d2
2015-04-11T05:58:37
Some Raspberry Pi build fixes (including Raspberry Pi 2 support). Fixes Bugzilla #2879.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/build-scripts/config.guess b/build-scripts/config.guess
index ddb3622..68c1be3 100644
--- a/build-scripts/config.guess
+++ b/build-scripts/config.guess
@@ -898,6 +898,7 @@ EOF
else
case `sed -n '/^Hardware/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
BCM2708) MANUFACTURER=raspberry;;
+ BCM2709) MANUFACTURER=raspberry;;
*) MANUFACTURER=unknown;;
esac
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
diff --git a/configure b/configure
index e220948..42283e1 100755
--- a/configure
+++ b/configure
@@ -22941,7 +22941,9 @@ case "$host" in
if test x$enable_video = xyes; then
SOURCES="$SOURCES $srcdir/src/video/raspberry/*.c"
+ # FIXME: confdefs? Not AC_DEFINE?
$as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h
+ SUMMARY_video="${SUMMARY_video} rpi"
fi
;;
*-*-androideabi*)
@@ -22955,6 +22957,7 @@ case "$host" in
if test x$enable_video = xyes; then
SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
+ # FIXME: confdefs? Not AC_DEFINE?
$as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
SUMMARY_video="${SUMMARY_video} android"
fi
diff --git a/configure.in b/configure.in
index 6e38782..38c682b 100644
--- a/configure.in
+++ b/configure.in
@@ -2837,7 +2837,9 @@ case "$host" in
if test x$enable_video = xyes; then
SOURCES="$SOURCES $srcdir/src/video/raspberry/*.c"
+ # FIXME: confdefs? Not AC_DEFINE?
$as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h
+ SUMMARY_video="${SUMMARY_video} rpi"
fi
;;
*-*-androideabi*)
@@ -2851,6 +2853,7 @@ case "$host" in
if test x$enable_video = xyes; then
SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
+ # FIXME: confdefs? Not AC_DEFINE?
$as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
SUMMARY_video="${SUMMARY_video} android"
fi