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
(Blackberry) Define CC and AR in Makefile - so we can compile from the
[pcsx_rearmed.git]
/
configure
diff --git
a/configure
b/configure
index
c03d41f
..
bf704ed
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-49,6
+49,7
@@
have_tslib=""
have_gles=""
enable_dynarec="yes"
need_sdl="no"
have_gles=""
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
+63,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
+85,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
+183,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
+270,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
+295,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
+359,15
@@
EOF
compile_binary "$@"
}
compile_binary "$@"
}
+check_xlib_headers()
+{
+ cat > $TMPC <<EOF
+ #include <X11/Xlib.h>
+ void *f() { return XOpenDisplay(0); }
+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)"
@@
-416,6
+428,7
@@
fi
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"
LDLIBS_GLES="$LDLIBS_GLES -L/opt/vc/lib"
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"
LDLIBS_GLES="$LDLIBS_GLES -L/opt/vc/lib"
+ need_xlib="yes"
fi
# check for GLES headers
fi
# check for GLES headers
@@
-441,6
+454,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