Merge branch 'master' of https://github.com/pcm720/retroarch-clover

17 files changed, 85 insertions, 8 deletions

diff --git a/README.md b/README.md
index 1a29bfe..b961bda 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ And the following cores are available as additional modules (in core_modules fol
 - mupen64plus (Nintendo 64)
 - stella (Atari 2600)
 - mednafen_pce_fast (PC Engine/Turbografx 16)
+- fb_alpha and fb_alpha_cps2 (various arcade machines)
 
 Executables and arguments for all available cores:
 
@@ -45,6 +46,10 @@ Executables and arguments for all available cores:
           runs "stella" core
         - /bin/pce <rom> <clover_args>
           runs "mednafen_pce_fast" core
+        - /bin/fba <rom> <clover_args>
+          runs "fb_alpha" core
+        - /bin/cps2 <rom> <clover_args>
+          runs "fb_alpha_cps2" core
         - /bin/retroarch-mini [core] [rom] [args]
           runs RetroArch directly, without clover intergration
         - /bin/retroarch
@@ -70,6 +75,7 @@ The following changes were made in this fork:
 - Enter RetroArch in-game menu by pressing Select + Start
 - Added template for adding new cores via hakchi module system
 - Cores are now represented as additional modules
+- Added Final Burn Alpha and Final Burn Alpha CPS2 cores
 
 NES Mini port by madmonkey
 
diff --git a/core_modules/fb_alpha.hmod/bin/fba b/core_modules/fb_alpha.hmod/bin/fba
new file mode 100755
index 0000000..686f601
--- /dev/null
+++ b/core_modules/fb_alpha.hmod/bin/fba
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover fb_alpha "$@"
diff --git a/core_modules/fb_alpha.hmod/etc/libretro/core/fb_alpha_libretro.so b/core_modules/fb_alpha.hmod/etc/libretro/core/fb_alpha_libretro.so
new file mode 100755
index 0000000..2f0939d
--- /dev/null
+++ b/core_modules/fb_alpha.hmod/etc/libretro/core/fb_alpha_libretro.so
diff --git a/core_modules/fb_alpha.hmod/etc/libretro/info/fbalpha_libretro.info b/core_modules/fb_alpha.hmod/etc/libretro/info/fbalpha_libretro.info
new file mode 100755
index 0000000..8e98b4c
--- /dev/null
+++ b/core_modules/fb_alpha.hmod/etc/libretro/info/fbalpha_libretro.info
@@ -0,0 +1,13 @@
+display_name = "Arcade (FB Alpha)"
+authors = "Team FB Alpha"
+supported_extensions = "iso|zip|7z"
+corename = "FB Alpha"
+manufacturer = "Various"
+categories = "Emulator"
+systemname = "Arcade (various)"
+database = "FB Alpha - Arcade Games"
+license = "Non-commercial"
+permissions = ""
+display_version = "v0.2.97.39"
+supports_no_game = "false"
+notes = "(!) The BIOS files must be inside the ROM directory.|"
diff --git a/core_modules/fb_alpha.hmod/install b/core_modules/fb_alpha.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/fb_alpha.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/fb_alpha.hmod/readme.txt b/core_modules/fb_alpha.hmod/readme.txt
new file mode 100644
index 0000000..41d20ac
--- /dev/null
+++ b/core_modules/fb_alpha.hmod/readme.txt
@@ -0,0 +1,13 @@
+=== Final Burn Alpha core for RetroArch ===

+

+This module will add support for Atari 2600 games to RetroArch

+

+Available executables and arguments:

+- /bin/fba <rom> <clover_args>

+  runs "fb_alpha" core

+

+Core by libretro

+Module by pcm

+Hakchi module system by madmonkey

+NES Mini shell integration by Cluster

+(c) 2016-2017

diff --git a/core_modules/fb_alpha_cps2.hmod/bin/cps2 b/core_modules/fb_alpha_cps2.hmod/bin/cps2
new file mode 100755
index 0000000..b1dcee3
--- /dev/null
+++ b/core_modules/fb_alpha_cps2.hmod/bin/cps2
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover fb_alpha_cps2 "$@"
diff --git a/core_modules/fb_alpha_cps2.hmod/etc/libretro/core/fb_alpha_cps2_libretro.so b/core_modules/fb_alpha_cps2.hmod/etc/libretro/core/fb_alpha_cps2_libretro.so
new file mode 100755
index 0000000..e05b4a1
--- /dev/null
+++ b/core_modules/fb_alpha_cps2.hmod/etc/libretro/core/fb_alpha_cps2_libretro.so
diff --git a/core_modules/fb_alpha_cps2.hmod/etc/libretro/info/fbalpha2012_cps2_libretro.info b/core_modules/fb_alpha_cps2.hmod/etc/libretro/info/fbalpha2012_cps2_libretro.info
new file mode 100755
index 0000000..8ff6b6d
--- /dev/null
+++ b/core_modules/fb_alpha_cps2.hmod/etc/libretro/info/fbalpha2012_cps2_libretro.info
@@ -0,0 +1,12 @@
+display_name = "Arcade (FB Alpha 2012 CPS-2)"
+authors = "Team FB Alpha"
+supported_extensions = "zip"
+corename = "FB Alpha 2012 CPS-2"
+manufacturer = "Capcom"
+categories = "Emulator"
+systemname = "CP System II"
+license = "Non-commercial"
+permissions = ""
+display_version = "v0.2.97.28"
+supports_no_game = "false"
+notes = "(!) The BIOS files must be inside the ROM directory."
diff --git a/core_modules/fb_alpha_cps2.hmod/install b/core_modules/fb_alpha_cps2.hmod/install
new file mode 100644
index 0000000..6e0a007
--- /dev/null
+++ b/core_modules/fb_alpha_cps2.hmod/install
@@ -0,0 +1,4 @@
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
+return 1
diff --git a/core_modules/fb_alpha_cps2.hmod/readme.txt b/core_modules/fb_alpha_cps2.hmod/readme.txt
new file mode 100644
index 0000000..d63ce5d
--- /dev/null
+++ b/core_modules/fb_alpha_cps2.hmod/readme.txt
@@ -0,0 +1,13 @@
+=== Final Burn Alpha CPS2 core for RetroArch ===

+

+This module will add support for Atari 2600 games to RetroArch

+

+Available executables and arguments:

+- /bin/cps2 <rom> <clover_args>

+  runs "fb_alpha_cps2" core

+

+Core by libretro

+Module by pcm

+Hakchi module system by madmonkey

+NES Mini shell integration by Cluster

+(c) 2016-2017

diff --git a/libretro_core_template.hmod/bin/core b/libretro_core_template.hmod/bin/core
new file mode 100755
index 0000000..0aa268f
--- /dev/null
+++ b/libretro_core_template.hmod/bin/core
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover core "$@"
diff --git a/libretro_core_template.hmod/etc/libretro/core/put so here b/libretro_core_template.hmod/etc/libretro/core/put so here
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/libretro_core_template.hmod/etc/libretro/core/put so here
diff --git a/libretro_core_template.hmod/etc/libretro/info/put info here b/libretro_core_template.hmod/etc/libretro/info/put info here
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/libretro_core_template.hmod/etc/libretro/info/put info here
diff --git a/libretro_core_template.hmod/install b/libretro_core_template.hmod/install
index 7c0ca75..6e0a007 100755
--- a/libretro_core_template.hmod/install
+++ b/libretro_core_template.hmod/install
@@ -1,3 +1,4 @@
-core_name=<>_libretro.so
-copy "$transferpath/$core_name" "$rootfs/etc/libretro/core/$core_name"
+transfer_default
+chmod +x $rootfs/bin/*
+chmod +x $rootfs/usr/bin/*
 return 1
diff --git a/libretro_core_template.hmod/readme.txt b/libretro_core_template.hmod/readme.txt
index 7819be9..be264d8 100755
--- a/libretro_core_template.hmod/readme.txt
+++ b/libretro_core_template.hmod/readme.txt
@@ -1,8 +1,15 @@
 Use this template to add and remove your own cores:

 1. Make a backup of libretro_core_template.hmod folder

-2. Copy your *.so file to libretro_core_template.hmod folder and rename the folder to something more meaningful (e.g., <core name>.hmod)

-3. Open "install" and "uninstall" scripts with Notepad++ or Sublime Text and change the <> to your core name

+2. Rename the folder to something more meaningful

+3. Copy your *.so file to <hmod folder>/etc/libretro/core folder

+4. Copy the corresponding *.info file to <hmod folder>/etc/libretro/info

+5. Open /bin/core with Notepad++ or Sublime Text and change the "core" to your core name (without "_libretro.so"!)

+6. Rename core to something more meaningful. You'll need to change "/bin/path-to-your-app" line in Hakchi2 with "/bin/<file you've renamed>"

+

 Example:

 The core name is fb_alpha_libretro.so:

-1. Copy your fb_alpha_libretro.so file to libretro_core_template.hmod folder and rename the folder to fb_alpha.hmod

-2. Open "install" and "uninstall" scripts with Notepad++ or Sublime Text and change the <> to fb_alpha

+2. Rename the folder to fb_alpha

+3. Copy your fb_alpha_libretro.so file to <hmod folder>/etc/libretro/core folder

+4. Copy the corresponding fb_alpha_libretro.info file to <hmod folder>/etc/libretro/info

+5. Open /bin/core with Notepad++ or Sublime Text and change the "core" to "fb_alpha"

+6. Rename core to fba. You'll need to change "/bin/path-to-your-app" line in Hakchi2 with "/bin/fba" for the games you want to start using FB Alpha

diff --git a/libretro_core_template.hmod/uninstall b/libretro_core_template.hmod/uninstall
deleted file mode 100755
index 02f6b44..0000000
--- a/libretro_core_template.hmod/uninstall
+++ /dev/null
@@ -1,2 +0,0 @@
-core_name=<>_libretro.so
-rm "$rootfs/etc/libretro/core/$core_name"