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
spu: adjust irqs again
[pcsx_rearmed.git]
/
configure
diff --git
a/configure
b/configure
index
e401902
..
39587aa
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-24,7
+24,13
@@
compile_binary()
check_define()
{
check_define()
{
- $CC -E -dD $CFLAGS include/arm_features.h | grep -q $1 || return 1
+ $CC -E -dD $CFLAGS include/arm_features.h | grep -q "$1" || return 1
+ return 0
+}
+
+check_define_val()
+{
+ $CC -E -dD $CFLAGS include/arm_features.h | grep "$1" | awk '{print $3}'
return 0
}
return 0
}
@@
-33,20
+39,21
@@
check_define()
platform_list="generic pandora maemo caanoo libretro"
platform="generic"
platform_list="generic pandora maemo caanoo libretro"
platform="generic"
-builtin_gpu_list="peops unai neon"
+builtin_gpu_list="peops unai neon
senquack
"
builtin_gpu=""
sound_driver_list="oss alsa pulseaudio sdl libretro"
sound_drivers=""
plugins="plugins/spunull/spunull.so \
builtin_gpu=""
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"
-ram_fixed="no"
+plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so plugins/gpu_senquack/gpu_senquack.so"
drc_cache_base="no"
have_armv5=""
have_armv6=""
have_armv7=""
have_arm_neon=""
drc_cache_base="no"
have_armv5=""
have_armv6=""
have_armv7=""
have_arm_neon=""
+have_arm_neon_asm=""
have_tslib=""
have_gles=""
have_tslib=""
have_gles=""
+have_c64x_dsp=""
enable_dynarec="yes"
need_sdl="no"
need_xlib="no"
enable_dynarec="yes"
need_sdl="no"
need_xlib="no"
@@
-66,9
+73,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
}
@@
-81,21
+92,18
@@
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"
;;
maemo)
drc_cache_base="yes"
optimize_cortexa8="yes"
have_arm_neon="yes"
need_xlib="yes"
;;
maemo)
- ram_fixed="yes"
drc_cache_base="yes"
optimize_cortexa8="yes"
have_arm_neon="yes"
;;
caanoo)
sound_drivers="oss"
drc_cache_base="yes"
optimize_cortexa8="yes"
have_arm_neon="yes"
;;
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"
@@
-205,7
+213,7
@@
arm*)
fi
if [ "x$have_arm_neon" = "x" ]; then
fi
if [ "x$have_arm_neon" = "x" ]; then
- # detect NEON from user-supplied cflags to enable
asm
code
+ # detect NEON from user-supplied cflags to enable
neon
code
have_arm_neon=`check_define __ARM_NEON__ && echo yes` || true
fi
if [ "x$have_armv7" = "x" ]; then
have_arm_neon=`check_define __ARM_NEON__ && echo yes` || true
fi
if [ "x$have_armv7" = "x" ]; then
@@
-270,6
+278,20
@@
arm*)
echo "You probably want to specify -mcpu= or -march= like this:"
echo " CFLAGS=-march=armv7-a ./configure ..."
fi
echo "You probably want to specify -mcpu= or -march= like this:"
echo " CFLAGS=-march=armv7-a ./configure ..."
fi
+ have_arm_neon_asm=$have_arm_neon
+ ;;
+aarch64)
+ have_arm_neon="yes"
+ have_arm_neon_asm="no"
+ if [ "x$builtin_gpu" = "x" ]; then
+ builtin_gpu="neon"
+ fi
+ ;;
+x86_64)
+ enable_dynarec="no"
+ if [ "x$builtin_gpu" = "x" ]; then
+ builtin_gpu="neon"
+ fi
;;
*)
# dynarec only available on ARM
;;
*)
# dynarec only available on ARM
@@
-286,10
+308,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"
@@
-368,6
+386,16
@@
EOF
compile_object "$@"
}
compile_object "$@"
}
+# see if we have c64_tools for TI C64x DSP
+check_c64_tools()
+{
+ cat > $TMPC <<EOF
+ #include <inc_libc64_mini.h>
+ int f() { return dsp_open(); }
+EOF
+ compile_object "$@"
+}
+
MAIN_LDLIBS="$MAIN_LDLIBS -lz"
check_zlib || fail "please install zlib (libz-dev)"
MAIN_LDLIBS="$MAIN_LDLIBS -lz"
check_zlib || fail "please install zlib (libz-dev)"
@@
-385,7
+413,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
@@
-404,10
+432,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
@@
-425,10
+453,14
@@
EOF
fi
# check for VideoCore stuff for Raspberry Pi
fi
# check for VideoCore stuff for Raspberry Pi
-if [ -d /opt/vc/include -a -d /opt/vc/lib ]; then
+if [ -d /opt/vc/include -a -d /opt/vc/lib
-a "$VIDEOCORE" != "no"
]; then
CFLAGS_GLES="$CFLAGS_GLES -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
LDLIBS_GLES="$LDLIBS_GLES -L/opt/vc/lib"
CFLAGS_GLES="$CFLAGS_GLES -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
LDLIBS_GLES="$LDLIBS_GLES -L/opt/vc/lib"
+ if [ -f /opt/vc/lib/libbcm_host.so ]; then
+ LDLIBS_GLES="$LDLIBS_GLES -lbcm_host"
+ fi
need_xlib="yes"
need_xlib="yes"
+ VIDEOCORE="yes"
fi
# check for GLES headers
fi
# check for GLES headers
@@
-439,7
+471,10
@@
int main(void) {
return (int)eglGetDisplay( (EGLNativeDisplayType)0 );
}
EOF
return (int)eglGetDisplay( (EGLNativeDisplayType)0 );
}
EOF
-if compile_binary $CFLAGS_GLES -lEGL -lGLES_CM $LDLIBS_GLES; then
+if [ "$VIDEOCORE" = "yes" ] && compile_binary $CFLAGS_GLES -lbrcmEGL -lbrcmGLESv2 $LDLIBS_GLES; then
+ have_gles="yes"
+ LDLIBS_GLES="-lbrcmEGL -lbrcmGLESv2 $LDLIBS_GLES"
+elif 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 -lGLES_CM $LDLIBS_GLES"
elif compile_binary $CFLAGS_GLES -lEGL -lGLESv1_CM $LDLIBS_GLES; then
@@
-447,6
+482,10
@@
elif compile_binary $CFLAGS_GLES -lEGL -lGLESv1_CM $LDLIBS_GLES; then
LDLIBS_GLES="-lEGL -lGLESv1_CM $LDLIBS_GLES"
fi
LDLIBS_GLES="-lEGL -lGLESv1_CM $LDLIBS_GLES"
fi
+if check_c64_tools; then
+ have_c64x_dsp="yes"
+fi
+
if [ "$have_gles" = "yes" ]; then
plugins="$plugins plugins/gpu-gles/gpu_gles.so"
fi
if [ "$have_gles" = "yes" ]; then
plugins="$plugins plugins/gpu-gles/gpu_gles.so"
fi
@@
-459,6
+498,11
@@
if [ "x$need_xlib" = "xyes" ]; then
check_xlib_headers || fail "please install libx11-dev"
fi
check_xlib_headers || fail "please install libx11-dev"
fi
+sizeof_long=`check_define_val __SIZEOF_LONG__`
+if [ "x$sizeof_long" = "x4" ]; then
+ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
+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
@@
-476,7
+520,9
@@
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_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_arm_neon_asm" != "x" || have_arm_neon_asm="no"
test "x$have_gles" != "x" || have_gles="no"
test "x$have_gles" != "x" || have_gles="no"
+test "x$have_c64x_dsp" != "x" || have_c64x_dsp="no"
echo "architecture $ARCH"
echo "platform $platform"
echo "architecture $ARCH"
echo "platform $platform"
@@
-488,8
+534,13
@@
echo "C compiler flags $CFLAGS"
echo "libraries $MAIN_LDLIBS"
echo "linker flags $LDFLAGS$MAIN_LDFLAGS"
echo "enable dynarec $enable_dynarec"
echo "libraries $MAIN_LDLIBS"
echo "linker flags $LDFLAGS$MAIN_LDFLAGS"
echo "enable dynarec $enable_dynarec"
-echo "ARMv7 optimizations $have_armv7"
-echo "enable ARM NEON $have_arm_neon"
+if [ "$ARCH" = "arm" -o "$ARCH" = "aarch64" ]; then
+ echo "enable ARM NEON $have_arm_neon"
+fi
+if [ "$ARCH" = "arm" ]; then
+ echo "ARMv7 optimizations $have_armv7"
+ echo "TI C64x DSP support $have_c64x_dsp"
+fi
echo "tslib support $have_tslib"
if [ "$platform" = "generic" ]; then
echo "OpenGL ES output $have_gles"
echo "tslib support $have_tslib"
if [ "$platform" = "generic" ]; then
echo "OpenGL ES output $have_gles"
@@
-522,6
+573,9
@@
echo "PLUGINS = $plugins" >> $config_mak
if [ "$have_arm_neon" = "yes" ]; then
echo "HAVE_NEON = 1" >> $config_mak
fi
if [ "$have_arm_neon" = "yes" ]; then
echo "HAVE_NEON = 1" >> $config_mak
fi
+if [ "$have_arm_neon_asm" = "yes" ]; then
+ echo "HAVE_NEON_ASM = 1" >> $config_mak
+fi
if [ "$have_tslib" = "yes" ]; then
echo "HAVE_TSLIB = 1" >> $config_mak
fi
if [ "$have_tslib" = "yes" ]; then
echo "HAVE_TSLIB = 1" >> $config_mak
fi
@@
-534,7
+588,10
@@
if [ "$enable_dynarec" = "yes" ]; then
echo "USE_DYNAREC = 1" >> $config_mak
fi
if [ "$drc_cache_base" = "yes" ]; then
echo "USE_DYNAREC = 1" >> $config_mak
fi
if [ "$drc_cache_base" = "yes" ]; then
- echo "DRC_CACHE_BASE = 1" >> $config_mak
+ echo "BASE_ADDR_DYNAMIC = 1" >> $config_mak
+fi
+if [ "$have_c64x_dsp" = "yes" ]; then
+ echo "HAVE_C64_TOOLS = 1" >> $config_mak
fi
# use pandora's skin (for now)
fi
# use pandora's skin (for now)