From 5b9aa74918361ff5d306c39cb695a77d7ea40b8f Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 21 Dec 2012 00:52:07 +0200 Subject: frontend: switch to libpicofe sdl code --- configure | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index e8e5b2a..8ef7611 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" @@ -362,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 < -#include #include -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 @@ -441,6 +456,11 @@ 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 -- cgit v1.2.3 From 2c616080220bf33a8348e12fd8a5c87052300a54 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 22 Dec 2012 03:12:58 +0200 Subject: bump libpicofe for r-pi gl code --- configure | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 8ef7611..f55e9b6 100755 --- a/configure +++ b/configure @@ -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 -- cgit v1.2.3 From b68bf5c238ef32ed93eb8935c5b0288da5b3ad67 Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 23 Dec 2012 02:21:53 +0200 Subject: frontend: fix pulseaudio, detect it in configure script --- configure | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index f55e9b6..eb859bf 100755 --- a/configure +++ b/configure @@ -36,7 +36,7 @@ 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" @@ -308,6 +308,15 @@ EOF compile_binary "$@" } +check_pulseaudio() +{ + cat > $TMPC < + void main() { pa_threaded_mainloop_new(); } +EOF + compile_binary "$@" +} + check_sdl() { cat > $TMPC <"; then + MAIN_LDLIBS="-lpulse $MAIN_LDLIBS" + check_pulseaudio || fail "pulseaudio support is missing" + fi fi if [ "$need_sdl" = "yes" ]; then -- cgit v1.2.3 From 00a212aade3025ba76e60d90520a7b302f83b7ff Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 23 Dec 2012 03:44:45 +0200 Subject: configure: detect common mistakes --- configure | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) (limited to 'configure') diff --git a/configure b/configure index eb859bf..c03d41f 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 } @@ -42,6 +41,7 @@ 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="" @@ -175,6 +175,15 @@ if [ "$need_warm" = "yes" ]; then fi fi +# basic compiler test +cat > $TMPC < +int main(void) { return 0; } +EOF +if ! compile_binary; then + fail "basic 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}'` @@ -195,15 +204,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 @@ -236,6 +252,20 @@ if [ "$ARCH" = "arm" ]; then if check_define __thumb__; then CFLAGS="$CFLAGS -marm" fi + + # 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 else # dynarec only available on ARM enable_dynarec="no" @@ -428,6 +458,7 @@ 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" echo "architecture $ARCH" echo "platform $platform" -- cgit v1.2.3