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
gte_arm.S: Use ARMv6 if possible
[pcsx_rearmed.git]
/
configure
diff --git
a/configure
b/configure
index
c03d41f
..
4ffa3a2
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-47,8
+47,10
@@
have_armv7=""
have_arm_neon=""
have_tslib=""
have_gles=""
have_arm_neon=""
have_tslib=""
have_gles=""
+have_c64x_dsp=""
enable_dynarec="yes"
need_sdl="no"
enable_dynarec="yes"
need_sdl="no"
+need_xlib="no"
need_libpicofe="yes"
need_warm="no"
CFLAGS_GLES=""
need_libpicofe="yes"
need_warm="no"
CFLAGS_GLES=""
@@
-62,7
+64,7
@@
CC="${CC-${CROSS_COMPILE}gcc}"
CXX="${CXX-${CROSS_COMPILE}g++}"
AS="${AS-${CROSS_COMPILE}as}"
AR="${AS-${CROSS_COMPILE}ar}"
CXX="${CXX-${CROSS_COMPILE}g++}"
AS="${AS-${CROSS_COMPILE}as}"
AR="${AS-${CROSS_COMPILE}ar}"
-MAIN_LDLIBS="$LDLIBS -ldl -lm"
+MAIN_LDLIBS="$LDLIBS -ldl -lm
-lpthread
"
config_mak="config.mak"
fail()
config_mak="config.mak"
fail()
@@
-84,6
+86,7
@@
set_platform()
drc_cache_base="yes"
optimize_cortexa8="yes"
have_arm_neon="yes"
drc_cache_base="yes"
optimize_cortexa8="yes"
have_arm_neon="yes"
+ need_xlib="yes"
;;
maemo)
ram_fixed="yes"
;;
maemo)
ram_fixed="yes"
@@
-181,16
+184,18
@@
cat > $TMPC <<EOF
int main(void) { return 0; }
EOF
if ! compile_binary; then
int main(void) { return 0; }
EOF
if ! compile_binary; then
- fail "
basic
compiler test failed, please check config.log"
+ fail "compiler test failed, please check config.log"
fi
if [ -z "$ARCH" ]; then
fi
if [ -z "$ARCH" ]; then
- ARCH=`$CC -v 2>&1 | grep -i 'target:' | awk '{print $2}' \
- | awk -F '-' '{print $1}'`
+ ARCH=`$CC -dumpmachine | awk -F '-' '{print $1}'`
fi
fi
-# ARM stuff
-if [ "$ARCH" = "arm" ]; then
+case "$ARCH" in
+arm*)
+ # ARM stuff
+ ARCH="arm"
+
if [ "$optimize_cortexa8" = "yes" ]; then
CFLAGS="$CFLAGS -mcpu=cortex-a8 -mtune=cortex-a8"
ASFLAGS="$ASFLAGS -mcpu=cortex-a8"
if [ "$optimize_cortexa8" = "yes" ]; then
CFLAGS="$CFLAGS -mcpu=cortex-a8 -mtune=cortex-a8"
ASFLAGS="$ASFLAGS -mcpu=cortex-a8"
@@
-266,10
+271,12
@@
if [ "$ARCH" = "arm" ]; then
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
-else
+ ;;
+*)
# dynarec only available on ARM
enable_dynarec="no"
# dynarec only available on ARM
enable_dynarec="no"
-fi
+ ;;
+esac
if [ "x$builtin_gpu" = "x" ]; then
builtin_gpu="peops"
if [ "x$builtin_gpu" = "x" ]; then
builtin_gpu="peops"
@@
-289,10
+296,7
@@
generic)
need_sdl="yes"
;;
maemo)
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"
- MAIN_LDLIBS="$MAIN_LDLIBS $maemo_ldlibs"
+ CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES"
;;
libretro)
CFLAGS="$CFLAGS -fPIC"
;;
libretro)
CFLAGS="$CFLAGS -fPIC"
@@
-356,6
+360,25
@@
EOF
compile_binary "$@"
}
compile_binary "$@"
}
+check_xlib_headers()
+{
+ cat > $TMPC <<EOF
+ #include <X11/Xlib.h>
+ void *f() { return XOpenDisplay(0); }
+EOF
+ 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)"
@@
-414,8
+437,12
@@
fi
# check for VideoCore stuff for Raspberry Pi
if [ -d /opt/vc/include -a -d /opt/vc/lib ]; then
# 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"
+ 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"
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"
fi
# check for GLES headers
fi
# check for GLES headers
@@
-434,6
+461,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
@@
-441,6
+472,11
@@
if [ "$have_arm_neon" = "yes" -a "$builtin_gpu" != "neon" ]; then
plugins="$plugins plugins/gpu_neon/gpu_neon.so"
fi
plugins="$plugins plugins/gpu_neon/gpu_neon.so"
fi
+# check for xlib (only headers needed)
+if [ "x$need_xlib" = "xyes" ]; then
+ check_xlib_headers || fail "please install libx11-dev"
+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
@@
-459,6
+495,7
@@
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"
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"
+test "x$have_c64x_dsp" != "x" || have_c64x_dsp="no"
echo "architecture $ARCH"
echo "platform $platform"
echo "architecture $ARCH"
echo "platform $platform"
@@
-470,8
+507,11
@@
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" ]; then
+ echo "ARMv7 optimizations $have_armv7"
+ echo "enable ARM NEON $have_arm_neon"
+ 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"
@@
-518,6
+558,9
@@
fi
if [ "$drc_cache_base" = "yes" ]; then
echo "DRC_CACHE_BASE = 1" >> $config_mak
fi
if [ "$drc_cache_base" = "yes" ]; then
echo "DRC_CACHE_BASE = 1" >> $config_mak
fi
+if [ "$have_c64x_dsp" = "yes" ]; then
+ echo "HAVE_C64_TOOLS = 1" >> $config_mak
+fi
# use pandora's skin (for now)
test -e skin || ln -s frontend/pandora/skin skin
# use pandora's skin (for now)
test -e skin || ln -s frontend/pandora/skin skin