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
psxbios: Should fix input issues in some games.
[pcsx_rearmed.git]
/
configure
diff --git
a/configure
b/configure
index
c02721f
..
c3ff68f
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
}
@@
-436,10
+442,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
@@
-450,7
+460,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
@@
-474,6
+487,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