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

dist/info/emux_chip8_libretro.info

@@ -0,0 +1,11 @@
+display_name = "CHIP-8 (Emux)"
+supported_extensions = "ch8|bin|rom"
+authors = "Sebastien Ronsse"
+corename = "Emux CHIP-8"
+manufacturer = "Joseph Weisbecker"
+categories = "Emulator"
+systemname = "CHIP-8"
+license = "GPLv2"
+permissions = ""
+display_version = "Git"
+supports_no_game = "false"

dist/info/emux_gb_libretro.info

@@ -0,0 +1,11 @@
+display_name = "Game Boy / Game Boy Color (Emux)"
+authors = "Sebastien Ronsse"
+supported_extensions = "gb|bin|rom"
+corename = "Emux GB"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Game Boy/Game Boy Color"
+license = "GPLv2"
+permissions = ""
+display_version = "Git"
+supports_no_game = "false"

dist/info/emux_nes_libretro.info

@@ -0,0 +1,11 @@
+display_name = "NES / Famicom (Emux)"
+supported_extensions = "nes|bin|rom"
+authors = "Sebastien Ronsse"
+corename = "Emux NES"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Nintendo Entertainment System"
+license = "GPLv2"
+permissions = ""
+display_version = "Git"
+supports_no_game = "false"

dist/info/emux_sms_libretro.info

@@ -0,0 +1,11 @@
+display_name = "Sega Master System (Emux)"
+supported_extensions = "sms|bin|rom"
+authors = "Sebastien Ronsse"
+corename = "Emux SMS"
+manufacturer = "Sega"
+categories = "Emulator"
+systemname = "Sega Master System"
+license = "GPLv2"
+permissions = ""
+display_version = "Git"
+supports_no_game = "false"

libretro-build-common.sh

@@ -96,6 +96,11 @@ build_libretro_fba_cps1() {
    build_libretro_generic_makefile_subcore "fb_alpha" "fba_cores_cps1" "svn-current/trunk/fbacores/cps1" "makefile.libretro" ${FORMAT_COMPILER_TARGET}
 }
 
+
+copy_core_to_dist() {
+   cp "${1}_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
+}
+
 # $1 is corename
 # $2 is subdir. In case there is no subdir, enter "." here
 # $3 is Makefile name
@@ -112,7 +117,9 @@ build_libretro_generic_makefile() {
       fi
       echo "${MAKE}" -f ${3} platform="${4}" ${COMPILER} "-j${JOBS}"
       "${MAKE}" -f ${3} platform="${4}" ${COMPILER} "-j${JOBS}" || die "Failed to build ${1}"
-      cp "${1}_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
+      if [ -z "${5}" ]; then
+         copy_core_to_dist $1
+      fi
    else
       echo "${1} not fetched, skipping ..."
    fi
@@ -154,6 +161,14 @@ build_libretro_catsfc() {
    build_libretro_generic_makefile "catsfc" "." "Makefile" ${FORMAT_COMPILER_TARGET}
 }
 
+build_libretro_emux() {
+   build_libretro_generic_makefile "emux" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET} 1
+   copy_core_to_dist "emux_chip8"
+   copy_core_to_dist "emux_gb"
+   copy_core_to_dist "emux_nes"
+   copy_core_to_dist "emux_sms"
+}
+
 build_libretro_picodrive() {
    build_libretro_generic_makefile "picodrive" "." "Makefile.libretro" ${FORMAT_COMPILER_TARGET}
 }

libretro-build-ios.sh

@@ -79,4 +79,5 @@ else
    build_libretro_o2em
    build_libretro_4do
    build_libretro_gpsp
+   build_libretro_emux
 fi

libretro-build-qnx.sh

@@ -29,7 +29,8 @@ else
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
    build_libretro_beetle_psx
-   build_libretro_beetle_bsnes
+   build_libretro_beetle_snes
+   build_libretro_catsfc
    build_libretro_snes9x
    build_libretro_snes9x_next
    build_libretro_genesis_plus_gx
@@ -65,4 +66,5 @@ else
    build_libretro_virtualjaguar
    build_libretro_o2em
    build_libretro_4do
+   build_libretro_gpsp
 fi

libretro-build.sh

@@ -152,4 +152,5 @@ else
    build_libretro_o2em
    build_libretro_hatari
    build_libretro_gpsp
+   build_libretro_emux
 fi

libretro-fetch.sh

@@ -174,3 +174,4 @@ fetch_project_submodule_no_update "$REPO_BASE/libretro/crawl-ref.git" "libretro-
 fetch_project "$REPO_BASE/libretro/hatari.git" "libretro-hatari" "libretro/hatari"
 fetch_project "$REPO_BASE/libretro/TempGBA-libretro.git" "libretro-tempgba" "libretro/TempGBA"
 fetch_project "$REPO_BASE/libretro/gpsp.git" "libretro-gpsp" "libretro/gpsp"
+fetch_project "$REPO_BASE/libretro/emux.git" "libretro-emux" "libretro/Emux"