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: get rid of iSPUIRQWait
[pcsx_rearmed.git]
/
configure
diff --git
a/configure
b/configure
index
47c68b8
..
4cbcc80
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-28,6
+28,8
@@
platform_list="generic pandora maemo caanoo"
platform="generic"
sound_driver_list="oss alsa none"
sound_driver="alsa"
platform="generic"
sound_driver_list="oss alsa none"
sound_driver="alsa"
+plugins="plugins/spunull/spunull.so \
+plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so"
ram_fixed="no"
drc_cache_base="no"
have_armv6=""
ram_fixed="no"
drc_cache_base="no"
have_armv6=""
@@
-41,6
+43,7
@@
optimize_arm926ej="no"
# hardcoded stuff
CC="${CC-${CROSS_COMPILE}gcc}"
# hardcoded stuff
CC="${CC-${CROSS_COMPILE}gcc}"
+CXX="${CXX-${CROSS_COMPILE}g++}"
AS="${AS-${CROSS_COMPILE}as}"
AR="${AS-${CROSS_COMPILE}ar}"
config_mak="config.mak"
AS="${AS-${CROSS_COMPILE}as}"
AR="${AS-${CROSS_COMPILE}ar}"
config_mak="config.mak"
@@
-110,7
+113,7
@@
if [ "$show_help" = "yes" ]; then
echo " --disable-dynarec disable dynamic recompiler"
echo " (dynarec is only available and enabled on ARM)"
echo "influential environment variables:"
echo " --disable-dynarec disable dynamic recompiler"
echo " (dynarec is only available and enabled on ARM)"
echo "influential environment variables:"
- echo " CROSS_COMPILE CC AS AR CFLAGS ASFLAGS LDFLAGS LDLIBS"
+ echo " CROSS_COMPILE CC
CXX
AS AR CFLAGS ASFLAGS LDFLAGS LDLIBS"
exit 1
fi
exit 1
fi
@@
-193,7
+196,12
@@
if [ "$ram_fixed" = "yes" ]; then
CFLAGS="$CFLAGS -DRAM_FIXED"
fi
CFLAGS="$CFLAGS -DRAM_FIXED"
fi
-if [ "$platform" = "maemo" ]; then
+if [ "$platform" = "generic" ]; then
+ generic_cflags=`sdl-config --cflags`
+ generic_ldlibs=`sdl-config --libs`
+ CFLAGS="$CFLAGS $generic_cflags"
+ LDFLAGS="$LDFLAGS $generic_ldlibs"
+elif [ "$platform" = "maemo" ]; then
maemo_cflags=`pkg-config --cflags hildon-1`
maemo_ldlibs=`pkg-config --libs hildon-1`
CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES $maemo_cflags"
maemo_cflags=`pkg-config --cflags hildon-1`
maemo_ldlibs=`pkg-config --libs hildon-1`
CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES $maemo_cflags"
@@
-213,6
+221,25
@@
EOF
fi
fi
fi
fi
+# check for GLES headers
+cat > $TMPC <<EOF
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#include <EGL/egl.h>
+void *test(void) {
+ return eglGetDisplay( (EGLNativeDisplayType)0 );
+}
+EOF
+if compile_object; then
+ plugins="$plugins plugins/gpu-gles/gpu_gles.so"
+fi
+
+# short plugin list for display
+for p in $plugins; do
+ p1=`basename $p`
+ plugins_short="$p1 $plugins_short"
+done
+
# set things that failed to autodetect to "no"
test "x$have_armv6" != "x" || have_armv6="no"
test "x$have_armv7" != "x" || have_armv7="no"
# set things that failed to autodetect to "no"
test "x$have_armv6" != "x" || have_armv6="no"
test "x$have_armv7" != "x" || have_armv7="no"
@@
-221,8
+248,10
@@
test "x$have_arm_neon" != "x" || have_arm_neon="no"
echo "architecture $ARCH"
echo "platform $platform"
echo "sound driver $sound_driver"
echo "architecture $ARCH"
echo "platform $platform"
echo "sound driver $sound_driver"
+echo "plugins $plugins_short"
echo "C compiler $CC"
echo "C compiler flags $CFLAGS"
echo "C compiler $CC"
echo "C compiler flags $CFLAGS"
+echo "linker flags $LDFLAGS"
echo "enable dynarec $enable_dynarec"
echo "ARMv7 optimizations $have_armv7"
echo "enable ARM NEON $have_arm_neon"
echo "enable dynarec $enable_dynarec"
echo "ARMv7 optimizations $have_armv7"
echo "enable ARM NEON $have_arm_neon"
@@
-234,6
+263,7
@@
printf " '%s'" "$0" "$@" >> $config_mak
echo >> $config_mak
echo "CC = $CC" >> $config_mak
echo >> $config_mak
echo "CC = $CC" >> $config_mak
+echo "CXX = $CXX" >> $config_mak
echo "AS = $AS" >> $config_mak
echo "CFLAGS += $CFLAGS" >> $config_mak
echo "ASFLAGS += $ASFLAGS" >> $config_mak
echo "AS = $AS" >> $config_mak
echo "CFLAGS += $CFLAGS" >> $config_mak
echo "ASFLAGS += $ASFLAGS" >> $config_mak
@@
-255,6
+285,15
@@
none)
echo "USE_NO_SOUND = 1" >> $config_mak
;;
esac
echo "USE_NO_SOUND = 1" >> $config_mak
;;
esac
+if [ "$ARCH" = "arm" ]; then
+ echo "PLUGINS = $plugins" >> $config_mak
+else
+ echo -n "PLUGINS =" >> $config_mak
+ for p in $plugins; do
+ echo -n " ${p}.${ARCH}" >> $config_mak
+ done
+ echo >> $config_mak
+fi
if [ "$have_armv6" = "yes" ]; then
echo "HAVE_ARMV6 = 1" >> $config_mak
fi
if [ "$have_armv6" = "yes" ]; then
echo "HAVE_ARMV6 = 1" >> $config_mak
fi
@@
-274,4
+313,7
@@
if [ "$drc_cache_base" = "yes" ]; then
echo "DRC_CACHE_BASE = 1" >> $config_mak
fi
echo "DRC_CACHE_BASE = 1" >> $config_mak
fi
+# use pandora's skin (for now)
+test -e skin || ln -s frontend/pandora/skin skin
+
# vim:shiftwidth=2:expandtab
# vim:shiftwidth=2:expandtab