X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=configure;h=9668a2785a09675aded96065976364694ae8388a;hp=0618ac2119dfecfbdd4db3324217adefeaaf8dc9;hb=b2058a5bead44a5b5ecaa903e9bbf3231477fde9;hpb=f89fa2d9b2c3e90a361a38656cb45e20cf7cf097 diff --git a/configure b/configure index 0618ac21..9668a278 100755 --- a/configure +++ b/configure @@ -48,6 +48,8 @@ have_arm_neon="" have_tslib="" enable_dynarec="yes" need_sdl="no" +need_libpicofe="yes" +need_warm="no" # these are for known platforms optimize_cortexa8="no" optimize_arm926ej="no" @@ -91,9 +93,11 @@ set_platform() ram_fixed="yes" drc_cache_base="yes" optimize_arm926ej="yes" + need_warm="yes" ;; libretro) sound_drivers="libretro" + need_libpicofe="no" ;; *) fail "unsupported platform: $platform" @@ -156,6 +160,18 @@ if [ "x$sound_drivers" != "x" ]; then done fi +if [ "$need_libpicofe" = "yes" ]; then + if ! test -f "frontend/libpicofe/README"; then + fail "libpicofe is missing, please run 'git submodule init && git submodule update'" + fi +fi + +if [ "$need_warm" = "yes" ]; then + if ! test -f "frontend/warm/README"; then + fail "wARM is missing, please run 'git submodule init && git submodule update'" + fi +fi + if [ -z "$ARCH" ]; then ARCH=`$CC -v 2>&1 | grep -i 'target:' | awk '{print $2}' \ | awk -F '-' '{print $1}'` @@ -164,7 +180,6 @@ fi # ARM stuff if [ "$ARCH" = "arm" ]; then if [ "$optimize_cortexa8" = "yes" ]; then - # both: -mfpu=neon CFLAGS="$CFLAGS -mcpu=cortex-a8 -mtune=cortex-a8" ASFLAGS="$ASFLAGS -mcpu=cortex-a8" fi @@ -198,7 +213,7 @@ if [ "$ARCH" = "arm" ]; then fi fi - # set mfpu and mfloat-abi if they are not set + # 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" @@ -206,14 +221,15 @@ if [ "$ARCH" = "arm" ]; then echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=vfp" echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=vfp" fi - if [ "$have_armv6" = "yes" ]; then + 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 @@ -230,13 +246,6 @@ 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 - CFLAGS="$CFLAGS -m32" - LDFLAGS="$LDFLAGS -m32" -fi - # supposedly we can avoid -fPIC on armv5 for slightly better performace? if [ "$ARCH" != "arm" -o "$have_armv6" = "yes" ]; then PLUGIN_CFLAGS="$PLUGIN_CFLAGS -fPIC" @@ -258,7 +267,7 @@ maemo) ;; libretro) CFLAGS="$CFLAGS -fPIC" - LDFLAGS="$LDFLAGS -shared" + MAIN_LDFLAGS="$MAIN_LDFLAGS -shared -Wl,--no-undefined" ;; esac @@ -267,7 +276,7 @@ check_zlib() { cat > $TMPC < - void main() { uncompress(0, 0, 0, 0); } + int main(void) { uncompress(0, 0, 0, 0); } EOF compile_binary } @@ -319,12 +328,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 +342,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 +356,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 +394,13 @@ if [ "$have_arm_neon" = "yes" -a "$builtin_gpu" != "neon" ]; then plugins="$plugins plugins/gpu_neon/gpu_neon.so" fi +cat > $TMPC <> $config_mak echo "CFLAGS += $CFLAGS" >> $config_mak echo "ASFLAGS += $ASFLAGS" >> $config_mak echo "LDFLAGS += $LDFLAGS" >> $config_mak +echo "MAIN_LDFLAGS += $MAIN_LDFLAGS" >> $config_mak echo "MAIN_LDLIBS += $MAIN_LDLIBS" >> $config_mak echo "PLUGIN_CFLAGS += $PLUGIN_CFLAGS" >> $config_mak echo >> $config_mak @@ -430,15 +449,7 @@ 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 +echo "PLUGINS = $plugins" >> $config_mak if [ "$have_armv6" = "yes" ]; then echo "HAVE_ARMV6 = 1" >> $config_mak fi