[gnome-games/wip/exalm/rebrand: 97/124] nintendo-64: Move into the app
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/rebrand: 97/124] nintendo-64: Move into the app
- Date: Sat, 19 Jun 2021 14:37:46 +0000 (UTC)
commit fb037b54961fdac51cd3c82149112f83d199eb5d
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Tue Mar 30 18:13:25 2021 +0500
nintendo-64: Move into the app
meson_options.txt | 1 -
plugins/meson.build | 3 ---
plugins/nintendo-64/data/meson.build | 1 -
plugins/nintendo-64/data/nintendo-64.plugin | 6 -----
plugins/nintendo-64/meson.build | 2 --
plugins/nintendo-64/src/meson.build | 27 ----------------------
plugins/nintendo-64/src/nintendo-64-plugin.vala | 25 --------------------
plugins/nintendo-64/src/nintendo-64.gresource.xml | 7 ------
src/meson.build | 6 +++++
src/org.gnome.Games.gresource.xml | 3 +++
.../nintendo-64}/nintendo-64-pak-controller.ui | 0
.../nintendo-64}/nintendo-64-pak-controller.vala | 2 +-
.../nintendo-64}/nintendo-64-pak-switcher.ui | 0
.../nintendo-64}/nintendo-64-pak-switcher.vala | 2 +-
.../platforms/nintendo-64}/nintendo-64-pak.vala | 0
.../platforms/nintendo-64}/nintendo-64-runner.vala | 0
.../nintendo-64}/nintendo-64-snapshot.vala | 0
src/platforms/platform-register.vala | 10 ++++++++
18 files changed, 21 insertions(+), 74 deletions(-)
---
diff --git a/meson_options.txt b/meson_options.txt
index 9c03472b..18fc03eb 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 ('nintendo-64-plugin', description: 'Support for Nintendo 64 games', type: 'boolean')
option ('nintendo-ds-plugin', description: 'Support for Nintendo DS games', type: 'boolean')
option ('playstation-plugin', description: 'Support for PlayStation games', type: 'boolean')
option ('sega-cd-plugin', description: 'Support for Sega CD games', type: 'boolean')
diff --git a/plugins/meson.build b/plugins/meson.build
index bd7e1404..9e4f086d 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,7 +1,4 @@
plugins = [
- 'ms-dos',
- 'nintendo-3ds',
- 'nintendo-64',
'nintendo-ds',
'playstation',
'sega-cd',
diff --git a/src/meson.build b/src/meson.build
index 1e43f824..b2503f9c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -98,6 +98,12 @@ vala_sources = [
'platforms/nintendo-3ds/nintendo-3ds-layout.vala',
'platforms/nintendo-3ds/nintendo-3ds-runner.vala',
+ 'platforms/nintendo-64/nintendo-64-pak.vala',
+ 'platforms/nintendo-64/nintendo-64-pak-controller.vala',
+ 'platforms/nintendo-64/nintendo-64-pak-switcher.vala',
+ 'platforms/nintendo-64/nintendo-64-runner.vala',
+ 'platforms/nintendo-64/nintendo-64-snapshot.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 c988a61f..e9224f34 100644
--- a/src/org.gnome.Games.gresource.xml
+++ b/src/org.gnome.Games.gresource.xml
@@ -29,6 +29,9 @@
<file>platforms/mame/supported-games</file>
+ <file preprocess="xml-stripblanks">platforms/nintendo-64/nintendo-64-pak-controller.ui</file>
+ <file preprocess="xml-stripblanks">platforms/nintendo-64/nintendo-64-pak-switcher.ui</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/nintendo-64/src/nintendo-64-pak-controller.ui
b/src/platforms/nintendo-64/nintendo-64-pak-controller.ui
similarity index 100%
rename from plugins/nintendo-64/src/nintendo-64-pak-controller.ui
rename to src/platforms/nintendo-64/nintendo-64-pak-controller.ui
diff --git a/plugins/nintendo-64/src/nintendo-64-pak-controller.vala
b/src/platforms/nintendo-64/nintendo-64-pak-controller.vala
similarity index 91%
rename from plugins/nintendo-64/src/nintendo-64-pak-controller.vala
rename to src/platforms/nintendo-64/nintendo-64-pak-controller.vala
index d7656812..6b75df33 100644
--- a/plugins/nintendo-64/src/nintendo-64-pak-controller.vala
+++ b/src/platforms/nintendo-64/nintendo-64-pak-controller.vala
@@ -1,6 +1,6 @@
// This file is part of GNOME Games. License: GPL-3.0+.
-[GtkTemplate (ui = "/org/gnome/Games/plugins/nintendo-64/nintendo-64-pak-controller.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/platforms/nintendo-64/nintendo-64-pak-controller.ui")]
private class Games.Nintendo64PakController : Gtk.Box {
[GtkChild]
private unowned Gtk.Label title;
diff --git a/plugins/nintendo-64/src/nintendo-64-pak-switcher.ui
b/src/platforms/nintendo-64/nintendo-64-pak-switcher.ui
similarity index 100%
rename from plugins/nintendo-64/src/nintendo-64-pak-switcher.ui
rename to src/platforms/nintendo-64/nintendo-64-pak-switcher.ui
diff --git a/plugins/nintendo-64/src/nintendo-64-pak-switcher.vala
b/src/platforms/nintendo-64/nintendo-64-pak-switcher.vala
similarity index 95%
rename from plugins/nintendo-64/src/nintendo-64-pak-switcher.vala
rename to src/platforms/nintendo-64/nintendo-64-pak-switcher.vala
index d699a59a..993e6b22 100644
--- a/plugins/nintendo-64/src/nintendo-64-pak-switcher.vala
+++ b/src/platforms/nintendo-64/nintendo-64-pak-switcher.vala
@@ -1,6 +1,6 @@
// This file is part of GNOME Games. License: GPL-3.0+.
-[GtkTemplate (ui = "/org/gnome/Games/plugins/nintendo-64/nintendo-64-pak-switcher.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/platforms/nintendo-64/nintendo-64-pak-switcher.ui")]
private class Games.Nintendo64PakSwitcher : Gtk.Bin, HeaderBarWidget {
[GtkChild]
private unowned Gtk.MenuButton menu_button;
diff --git a/plugins/nintendo-64/src/nintendo-64-pak.vala b/src/platforms/nintendo-64/nintendo-64-pak.vala
similarity index 100%
rename from plugins/nintendo-64/src/nintendo-64-pak.vala
rename to src/platforms/nintendo-64/nintendo-64-pak.vala
diff --git a/plugins/nintendo-64/src/nintendo-64-runner.vala
b/src/platforms/nintendo-64/nintendo-64-runner.vala
similarity index 100%
rename from plugins/nintendo-64/src/nintendo-64-runner.vala
rename to src/platforms/nintendo-64/nintendo-64-runner.vala
diff --git a/plugins/nintendo-64/src/nintendo-64-snapshot.vala
b/src/platforms/nintendo-64/nintendo-64-snapshot.vala
similarity index 100%
rename from plugins/nintendo-64/src/nintendo-64-snapshot.vala
rename to src/platforms/nintendo-64/nintendo-64-snapshot.vala
diff --git a/src/platforms/platform-register.vala b/src/platforms/platform-register.vala
index e36f5fe5..727990cf 100644
--- a/src/platforms/platform-register.vala
+++ b/src/platforms/platform-register.vala
@@ -200,6 +200,16 @@ private class Games.PlatformRegister : Object {
platform.runner_type = typeof (Nintendo3DsRunner);
add_platform (platform);
+ platform = new Platform (
+ "Nintendo64",
+ _("Nintendo 64"),
+ "application/x-n64-rom",
+ "nintendo-64"
+ );
+ platform.snapshot_type = typeof (Nintendo64Snapshot);
+ platform.runner_type = typeof (Nintendo64Runner);
+ add_platform (platform);
+
platform = new Platform (
"NintendoEntertainmentSystem",
/* translators: known as "Famicom" in eastern Asia */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]