notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gpu_neon: new intrinsics-only implementation
[pcsx_rearmed.git]
/
configure
diff --git
a/configure
b/configure
index
b053a7a
..
cb124ac
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-45,7
+45,6
@@
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 plugins/gpu_senquack/gpu_senquack.so"
sound_drivers=""
plugins="plugins/spunull/spunull.so \
plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so plugins/gpu_senquack/gpu_senquack.so"
-ram_fixed="no"
drc_cache_base="no"
have_armv5=""
have_armv6=""
drc_cache_base="no"
have_armv5=""
have_armv6=""
@@
-59,7
+58,6
@@
need_sdl="no"
need_xlib="no"
need_libpicofe="yes"
need_warm="no"
need_xlib="no"
need_libpicofe="yes"
need_warm="no"
-enable_icache_emu="yes"
CFLAGS_GLES=""
LDLIBS_GLES=""
# these are for known platforms
CFLAGS_GLES=""
LDLIBS_GLES=""
# these are for known platforms
@@
-74,9
+72,13
@@
AR="${AS-${CROSS_COMPILE}ar}"
MAIN_LDLIBS="$LDLIBS -ldl -lm -lpthread"
config_mak="config.mak"
MAIN_LDLIBS="$LDLIBS -ldl -lm -lpthread"
config_mak="config.mak"
+SYSROOT="$(${CC} --print-sysroot)"
+[ "x${SDL_CONFIG}" = "x" ] && SDL_CONFIG="${SYSROOT}/usr/bin/sdl-config"
+
fail()
{
echo "$@"
fail()
{
echo "$@"
+ if test -n "$DUMP_CONFIG_LOG"; then cat config.log; fi
exit 1
}
exit 1
}
@@
-89,27
+91,21
@@
set_platform()
;;
pandora)
sound_drivers="oss alsa"
;;
pandora)
sound_drivers="oss alsa"
- ram_fixed="yes"
drc_cache_base="yes"
optimize_cortexa8="yes"
have_arm_neon="yes"
need_xlib="yes"
drc_cache_base="yes"
optimize_cortexa8="yes"
have_arm_neon="yes"
need_xlib="yes"
- enable_icache_emu="no"
;;
maemo)
;;
maemo)
- ram_fixed="yes"
drc_cache_base="yes"
optimize_cortexa8="yes"
have_arm_neon="yes"
drc_cache_base="yes"
optimize_cortexa8="yes"
have_arm_neon="yes"
- enable_icache_emu="no"
;;
caanoo)
sound_drivers="oss"
;;
caanoo)
sound_drivers="oss"
- ram_fixed="yes"
drc_cache_base="yes"
optimize_arm926ej="yes"
need_warm="yes"
drc_cache_base="yes"
optimize_arm926ej="yes"
need_warm="yes"
- enable_icache_emu="no"
;;
libretro)
sound_drivers="libretro"
;;
libretro)
sound_drivers="libretro"
@@
-138,10
+134,6
@@
for opt do
;;
--disable-dynarec) enable_dynarec="no"
;;
;;
--disable-dynarec) enable_dynarec="no"
;;
- --disable-icache-emu) enable_icache_emu="no"
- ;;
- --enable-icache-emu) enable_icache_emu="yes"
- ;;
*) echo "ERROR: unknown option $opt"; show_help="yes"
;;
esac
*) echo "ERROR: unknown option $opt"; show_help="yes"
;;
esac
@@
-287,6
+279,8
@@
arm*)
echo " CFLAGS=-march=armv7-a ./configure ..."
fi
;;
echo " CFLAGS=-march=armv7-a ./configure ..."
fi
;;
+aarch64)
+ ;;
*)
# dynarec only available on ARM
enable_dynarec="no"
*)
# dynarec only available on ARM
enable_dynarec="no"
@@
-302,10
+296,6
@@
if [ "$ARCH" != "arm" -o "$have_armv6" = "yes" ]; then
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -fPIC"
fi
PLUGIN_CFLAGS="$PLUGIN_CFLAGS -fPIC"
fi
-if [ "$ram_fixed" = "yes" ]; then
- CFLAGS="$CFLAGS -DRAM_FIXED"
-fi
-
case "$platform" in
generic)
need_sdl="yes"
case "$platform" in
generic)
need_sdl="yes"
@@
-411,7
+401,7
@@
if [ "x$sound_drivers" = "x" ]; then
sound_drivers="$sound_drivers pulseaudio"
MAIN_LDLIBS="-lpulse $MAIN_LDLIBS"
fi
sound_drivers="$sound_drivers pulseaudio"
MAIN_LDLIBS="-lpulse $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
sound_drivers="$sound_drivers sdl"
need_sdl="yes"
fi
@@
-430,10
+420,10
@@
else
fi
if [ "$need_sdl" = "yes" ]; then
fi
if [ "$need_sdl" = "yes" ]; then
- which
sdl-config
> /dev/null || \
+ which
${SDL_CONFIG}
> /dev/null || \
fail "sdl-config is missing; please install libsdl (libsdl1.2-dev)"
fail "sdl-config is missing; please install libsdl (libsdl1.2-dev)"
- CFLAGS="$CFLAGS `
sdl-config
--cflags`"
- MAIN_LDLIBS="`
sdl-config
--libs` $MAIN_LDLIBS"
+ CFLAGS="$CFLAGS `
${SDL_CONFIG}
--cflags`"
+ MAIN_LDLIBS="`
${SDL_CONFIG}
--libs` $MAIN_LDLIBS"
check_sdl || fail "please install libsdl (libsdl1.2-dev)"
fi
check_sdl || fail "please install libsdl (libsdl1.2-dev)"
fi
@@
-501,10
+491,6
@@
if [ "x$sizeof_long" = "x4" ]; then
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
fi
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
fi
-if [ "$enable_icache_emu" = "yes" ]; then
- CFLAGS="$CFLAGS -DICACHE_EMULATION"
-fi
-
cat > $TMPC <<EOF
void test(void *f, void *d) { fread(d, 1, 1, f); }
EOF
cat > $TMPC <<EOF
void test(void *f, void *d) { fread(d, 1, 1, f); }
EOF