[gnome-games/wip/exalm/rebrand: 93/124] game-cube: Move into the app
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/rebrand: 93/124] game-cube: Move into the app
- Date: Sat, 19 Jun 2021 14:37:46 +0000 (UTC)
commit 75d0df7aecc9f8fa6eba32cbc029a0d46494c762
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Tue Mar 30 17:36:44 2021 +0500
game-cube: Move into the app
meson_options.txt | 1 -
plugins/game-cube/data/game-cube.plugin | 6 ------
plugins/game-cube/data/meson.build | 1 -
plugins/game-cube/meson.build | 2 --
plugins/game-cube/src/game-cube-plugin.vala | 25 ----------------------
plugins/game-cube/src/game-cube.gresource.xml | 6 ------
plugins/game-cube/src/meson.build | 25 ----------------------
plugins/meson.build | 1 -
src/meson.build | 4 ++++
src/org.gnome.Games.gresource.xml | 2 ++
.../platforms/game-cube}/game-cube-header.vala | 0
.../platforms/game-cube}/game-cube-parser.vala | 0
.../platforms/game-cube}/game-cube-runner.vala | 2 +-
.../platforms/game-cube}/game-settings/GZ2.ini | 0
src/platforms/platform-register.vala | 10 +++++++++
15 files changed, 17 insertions(+), 68 deletions(-)
---
diff --git a/meson_options.txt b/meson_options.txt
index ba683ad4..5352290b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,7 +10,6 @@ option (
# Plugins
# This must mirror the list in plugins/meson.build
-option ('game-cube-plugin', description: 'Support for GameCube games', type: 'boolean')
option ('libretro-plugin', description: 'Support for Libretro games', type: 'boolean')
option ('mame-plugin', description: 'Support for MAME games', type: 'boolean')
option ('ms-dos-plugin', description: 'Support for MS-DOS games', type: 'boolean')
diff --git a/plugins/meson.build b/plugins/meson.build
index beac15dc..072e8461 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,5 +1,4 @@
plugins = [
- 'game-cube',
'mame',
'ms-dos',
'nintendo-3ds',
diff --git a/src/meson.build b/src/meson.build
index 655e7529..e245833c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -85,6 +85,10 @@ vala_sources = [
'platforms/dreamcast/dreamcast-parser.vala',
'platforms/dreamcast/gdi.vala',
+ 'platforms/game-cube/game-cube-header.vala',
+ 'platforms/game-cube/game-cube-parser.vala',
+ 'platforms/game-cube/game-cube-runner.vala',
+
'platforms/platform.vala',
'platforms/platform-model.vala',
'platforms/platform-register.vala',
diff --git a/src/org.gnome.Games.gresource.xml b/src/org.gnome.Games.gresource.xml
index 9816c852..08af0ae0 100644
--- a/src/org.gnome.Games.gresource.xml
+++ b/src/org.gnome.Games.gresource.xml
@@ -25,6 +25,8 @@
<file preprocess="xml-stripblanks">keyboard/keyboard-mapper.ui</file>
<file preprocess="xml-stripblanks">keyboard/keyboard-tester.ui</file>
+ <file>platforms/game-cube/game-settings/GZ2.ini</file>
+
<file preprocess="xml-stripblanks">preferences/preferences-page-controllers.ui</file>
<file preprocess="xml-stripblanks">preferences/preferences-page-platforms.ui</file>
<file preprocess="xml-stripblanks">preferences/preferences-page-video.ui</file>
diff --git a/plugins/game-cube/src/game-cube-header.vala b/src/platforms/game-cube/game-cube-header.vala
similarity index 100%
rename from plugins/game-cube/src/game-cube-header.vala
rename to src/platforms/game-cube/game-cube-header.vala
diff --git a/plugins/game-cube/src/game-cube-parser.vala b/src/platforms/game-cube/game-cube-parser.vala
similarity index 100%
rename from plugins/game-cube/src/game-cube-parser.vala
rename to src/platforms/game-cube/game-cube-parser.vala
diff --git a/plugins/game-cube/src/game-cube-runner.vala b/src/platforms/game-cube/game-cube-runner.vala
similarity index 93%
rename from plugins/game-cube/src/game-cube-runner.vala
rename to src/platforms/game-cube/game-cube-runner.vala
index 5fead278..0653a40f 100644
--- a/plugins/game-cube/src/game-cube-runner.vala
+++ b/src/platforms/game-cube/game-cube-runner.vala
@@ -23,7 +23,7 @@ private class Games.GameCubeRunner : Runner {
}
private void inject_override (string save_dir_path, string name) throws Error {
- var file = File.new_for_uri
(@"resource:///org/gnome/Games/plugins/game-cube/game-settings/$name.ini");
+ var file = File.new_for_uri
(@"resource:///org/gnome/Games/platforms/game-cube/game-settings/$name.ini");
if (!file.query_exists ())
return;
diff --git a/plugins/game-cube/src/game-settings/GZ2.ini b/src/platforms/game-cube/game-settings/GZ2.ini
similarity index 100%
rename from plugins/game-cube/src/game-settings/GZ2.ini
rename to src/platforms/game-cube/game-settings/GZ2.ini
diff --git a/src/platforms/platform-register.vala b/src/platforms/platform-register.vala
index dc8aceb1..62b17c3d 100644
--- a/src/platforms/platform-register.vala
+++ b/src/platforms/platform-register.vala
@@ -126,6 +126,16 @@ private class Games.PlatformRegister : Object {
);
add_platform (platform);
+ platform = new Platform (
+ "GameCube",
+ _("Nintendo GameCube"),
+ "application/x-gamecube-rom",
+ "game-cube"
+ );
+ platform.parser_type = typeof (GameCubeParser);
+ platform.runner_type = typeof (GameCubeRunner);
+ add_platform (platform);
+
platform = new Platform (
"GameGear",
_("Game Gear"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]