Merge branch 'master' of https://github.com/libretro/libretro-super

dist/info/fuse_libretro.info

@@ -5,7 +5,8 @@ corename = "Fuse"
 manufacturer = "Sinclair|Amstrad"
 categories = "Emulator"
 systemname = "ZX Spectrum (various)"
-license = "GPLv2"
+license = "GPLv3"
 permissions = ""
 display_version = "1.1.1"
 supports_no_game = "false"
+notes = "- Amstrad have kindly given their permission for the redistribution of their copyrighted material but retain that copyright|"

dist/info/test_libretro.info

@@ -0,0 +1,8 @@
+display_name = "Test"
+authors = "Team Libretro"
+corename = "Test"
+categories = "Tech demo"
+license = "MIT"
+permissions = ""
+display_version = "v1"
+supports_no_game = "true"

dist/info/testgl_libretro.info

@@ -0,0 +1,8 @@
+display_name = "TestGL"
+authors = "Team Libretro"
+corename = "TestGL"
+categories = "Tech demo"
+license = "MIT"
+permissions = ""
+display_version = "v1"
+supports_no_game = "true"

libretro-build-common.sh

@@ -127,15 +127,10 @@ copy_core_to_dist() {
    fi
 }
 
-# $1 is corename
+build_libretro_generic() {
-# $2 is subdir. In case there is no subdir, enter "." here
+   if [ -d "${5}" ]; then
-# $3 is Makefile name
-# $4 is preferred platform
-build_libretro_generic_makefile() {
-   build_dir="${WORKDIR}/libretro-${1}"
-   if [ -d "${build_dir}" ]; then
       echo "=== Building ${1} ==="
-      cd "${build_dir}/${2}"
+      cd "${5}/${2}"
 
       if [ -z "${NOCLEAN}" ]; then
          "${MAKE}" -f ${3} platform="${4}" CC="$CC" CXX="$CXX" "-j${JOBS}" clean || die "Failed to build ${1}"
@@ -150,6 +145,21 @@ build_libretro_generic_makefile() {
    fi
 }
 
+# $1 is corename
+# $2 is subdir. In case there is no subdir, enter "." here
+# $3 is Makefile name
+# $4 is preferred platform
+build_libretro_generic_makefile() {
+   build_dir="${WORKDIR}/libretro-${1}"
+   build_libretro_generic $1 $2 $3 $4 $build_dir
+}
+
+build_retroarch_generic_makefile() {
+   build_dir="${WORKDIR}/${1}"
+   build_libretro_generic $1 $2 $3 $4 $build_dir
+   copy_core_to_dist $5
+}
+
 build_libretro_stonesoup() {
    build_libretro_generic_makefile "stonesoup" "crawl-ref" "Makefile.libretro" ${FORMAT_COMPILER_TARGET}
 }
@@ -194,6 +204,14 @@ build_libretro_emux() {
    copy_core_to_dist "emux_sms"
 }
 
+build_libretro_test() {
+   build_retroarch_generic_makefile "retroarch" "libretro-test" "Makefile" ${FORMAT_COMPILER_TARGET} "test"
+}
+
+build_libretro_testgl() {
+   build_retroarch_generic_makefile "retroarch" "libretro-test-gl" "Makefile" ${FORMAT_COMPILER_TARGET} "testgl"
+}
+
 build_libretro_picodrive() {
    build_libretro_generic_makefile "picodrive" "." "Makefile.libretro" ${FORMAT_COMPILER_TARGET}
 }

libretro-build.sh

@@ -163,6 +163,8 @@ else
    build_libretro_hatari
    build_libretro_gpsp
    build_libretro_emux
+   build_libretro_test
+   build_libretro_testgl
    build_summary
 fi
 

recipes/recipes-android

@@ -4,7 +4,6 @@
 bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES_JNI Makefile target-libretro/jni performance 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES_JNI Makefile target-libretro/jni performance 
 catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
-desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_JNI Makefile android/eclipse/jni
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC_JNI Makefile.libretro jni 
 fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC_JNI makefile.libretro svn-current/trunk/projectfiles/libretro-android/jni 
@@ -28,12 +27,10 @@ meteor libretro-meteor  https://github.com/libretro/meteor-libretro.git PROJECT
 mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT NO GENERIC_JNI Makefile libretro/jni 
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
 nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
-o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT YES GENERIC_JNI Makefile jni 
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT YES GENERIC_JNI Makefile.libretro jni 
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC_JNI Makefile.libretro jni 
 ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git SUBMODULE YES GENERIC_JNI Makefile.libretro libretro/jni 
 prboom libretro-prboom  https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
-prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
 snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni 
 stella libretro-stella https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC_JNI Makefile jni 

recipes/recipes-android-r9

@@ -1 +1,4 @@
+desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni 
 mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
+o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT YES GENERIC_JNI Makefile jni 
+prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT YES GENERIC_JNI Makefile jni