X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=configure;h=0618ac2119dfecfbdd4db3324217adefeaaf8dc9;hp=ecd2215b59d2b2a731fd6e5b2fa348899721c497;hb=9c59f1201acf724294f4517d96d0698f19ffa94c;hpb=7badc9353b9570fd1c67827cfb477cef07974ddb diff --git a/configure b/configure index ecd2215b..0618ac21 100755 --- a/configure +++ b/configure @@ -4,12 +4,20 @@ 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 } @@ -24,10 +32,14 @@ check_define() # 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 sdl pulseaudio 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_armv6="" @@ -35,16 +47,25 @@ have_armv7="" have_arm_neon="" have_tslib="" enable_dynarec="yes" +need_sdl="no" # these are for known platforms optimize_cortexa8="no" optimize_arm926ej="no" # hardcoded stuff 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" config_mak="config.mak" +fail() +{ + echo "$@" + exit 1 +} + # call during arg parsing, so that cmd line can override platform defaults set_platform() { @@ -53,7 +74,7 @@ set_platform() generic) ;; pandora) - sound_driver="oss" + sound_drivers="oss alsa" ram_fixed="yes" drc_cache_base="yes" optimize_cortexa8="yes" @@ -66,14 +87,16 @@ set_platform() have_arm_neon="yes" ;; caanoo) - sound_driver="oss" + sound_drivers="oss" ram_fixed="yes" drc_cache_base="yes" optimize_arm926ej="yes" ;; + libretro) + sound_drivers="libretro" + ;; *) - echo "unsupported platform: $platform" - exit 1 + fail "unsupported platform: $platform" ;; esac } @@ -85,7 +108,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" ;; @@ -103,25 +128,33 @@ 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]" echo " --disable-dynarec disable dynamic recompiler" echo " (dynarec is only available and enabled on ARM)" echo "influential environment variables:" - echo " CROSS_COMPILE CC AS AR CFLAGS ASFLAGS LDFLAGS LDLIBS" + echo " CROSS_COMPILE CC CXX AS AR CFLAGS ASFLAGS LDFLAGS LDLIBS" 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 [ -z "$ARCH" ]; then ARCH=`$CC -v 2>&1 | grep -i 'target:' | awk '{print $2}' \ @@ -154,6 +187,17 @@ if [ "$ARCH" = "arm" ]; then fi fi + 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 + # 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" @@ -167,6 +211,11 @@ if [ "$ARCH" = "arm" ]; then echo "$ASFLAGS" | grep -q -- '-mfloat-abi=' || ASFLAGS="$ASFLAGS -mfloat-abi=softfp" fi + # must disable -mthumb as recompiler can't handle it + if check_define __thumb__; then + CFLAGS="$CFLAGS -mno-thumb" + fi + if [ "$have_armv7" = "yes" ]; then ASFLAGS="$ASFLAGS --defsym HAVE_ARMV7=1" else @@ -177,6 +226,10 @@ else enable_dynarec="no" fi +if [ "x$builtin_gpu" = "x" ]; then + builtin_gpu="peops" +fi + if [ "$ARCH" = "x86_64" ]; then # currently we are full of 32bit assumptions, # at least savestate compatibility will break without these @@ -193,16 +246,111 @@ 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 +case "$platform" in +generic) + need_sdl="yes" + ;; +maemo) 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" + MAIN_LDLIBS="$MAIN_LDLIBS $maemo_ldlibs" + ;; +libretro) + CFLAGS="$CFLAGS -fPIC" + LDFLAGS="$LDFLAGS -shared" + ;; +esac + +# header/library presence tests +check_zlib() +{ + cat > $TMPC < + void main() { uncompress(0, 0, 0, 0); } +EOF + compile_binary +} + +check_bzlib() +{ + cat > $TMPC < + void main() { BZ2_bzBuffToBuffDecompress(0, 0, 0, 0, 0, 0); } +EOF + compile_object +} + +check_libpng() +{ + cat > $TMPC < + void main() { png_init_io(0, 0); } +EOF + compile_binary +} + +check_oss() +{ + cat > $TMPC < + #include + void main() { int a=0; ioctl(0, SNDCTL_DSP_SETFMT, &a); } +EOF + compile_binary +} + +check_alsa() +{ + cat > $TMPC < + void main() { snd_pcm_open(0, 0, 0, 0); } +EOF + compile_binary "$@" +} + +check_sdl() +{ + cat > $TMPC < + void main() { SDL_OpenAudio(0, 0); } +EOF + compile_binary "$@" +} + +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" + +# 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 [ "$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 "\"; then + check_oss || fail "oss support is missing" + fi + if echo $sound_drivers | grep -q "\"; then + MAIN_LDLIBS="-lasound $MAIN_LDLIBS" + check_alsa || fail "please install libasound2-dev" + fi +fi + +if [ "$need_sdl" == "yes" ]; then + CFLAGS="$CFLAGS `sdl-config --cflags`" + MAIN_LDLIBS="`sdl-config --libs` $MAIN_LDLIBS" + check_sdl || fail "please install libsdl1.2-dev" fi # check for tslib (only headers needed) @@ -218,6 +366,29 @@ EOF fi fi +# check for GLES headers +cat > $TMPC < +#include +#include +void *test(void) { + return eglGetDisplay( (EGLNativeDisplayType)0 ); +} +EOF +if compile_object; 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 + +# 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" @@ -225,9 +396,12 @@ test "x$have_arm_neon" != "x" || have_arm_neon="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 "libraries $MAIN_LDLIBS" echo "linker flags $LDFLAGS" echo "enable dynarec $enable_dynarec" echo "ARMv7 optimizations $have_armv7" @@ -240,27 +414,31 @@ printf " '%s'" "$0" "$@" >> $config_mak echo >> $config_mak echo "CC = $CC" >> $config_mak +echo "CXX = $CXX" >> $config_mak 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_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 +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 @@ -280,4 +458,7 @@ if [ "$drc_cache_base" = "yes" ]; then echo "DRC_CACHE_BASE = 1" >> $config_mak fi +# use pandora's skin (for now) +test -e skin || ln -s frontend/pandora/skin skin + # vim:shiftwidth=2:expandtab