[gnome-games/wip/exalm/reorganize: 5/11] nintendo-64: Move resources to src/
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/reorganize: 5/11] nintendo-64: Move resources to src/
- Date: Thu, 10 Dec 2020 18:48:04 +0000 (UTC)
commit b52b7de33ee7aced099564fb24f59e9d4634846c
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Thu Dec 10 23:22:46 2020 +0500
nintendo-64: Move resources to src/
plugins/nintendo-64/data/meson.build | 6 ------
plugins/nintendo-64/src/meson.build | 6 ++++++
plugins/nintendo-64/{data/ui => src}/nintendo-64-pak-controller.ui | 0
plugins/nintendo-64/src/nintendo-64-pak-controller.vala | 2 +-
plugins/nintendo-64/{data/ui => src}/nintendo-64-pak-switcher.ui | 0
plugins/nintendo-64/src/nintendo-64-pak-switcher.vala | 2 +-
plugins/nintendo-64/{data => src}/nintendo-64.gresource.xml | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/plugins/nintendo-64/data/meson.build b/plugins/nintendo-64/data/meson.build
index 063fe570..0d4b6c49 100644
--- a/plugins/nintendo-64/data/meson.build
+++ b/plugins/nintendo-64/data/meson.build
@@ -1,7 +1 @@
install_data (plugin_name + '.plugin', install_dir: plugins_dir)
-
-nintendo_64_resources = gnome.compile_resources (
- 'nintendo-64',
- 'nintendo-64.gresource.xml',
- c_name: 'resources'
-)
diff --git a/plugins/nintendo-64/src/meson.build b/plugins/nintendo-64/src/meson.build
index f5f14bd7..3bcb4484 100644
--- a/plugins/nintendo-64/src/meson.build
+++ b/plugins/nintendo-64/src/meson.build
@@ -12,6 +12,12 @@ c_args = [
'-DG_LOG_DOMAIN="GamesNintendo64"'
]
+nintendo_64_resources = gnome.compile_resources (
+ 'nintendo-64',
+ 'nintendo-64.gresource.xml',
+ c_name: 'resources'
+)
+
shared_module (
'games-' + plugin_name + '-plugin',
vala_sources + nintendo_64_resources,
diff --git a/plugins/nintendo-64/data/ui/nintendo-64-pak-controller.ui
b/plugins/nintendo-64/src/nintendo-64-pak-controller.ui
similarity index 100%
rename from plugins/nintendo-64/data/ui/nintendo-64-pak-controller.ui
rename to plugins/nintendo-64/src/nintendo-64-pak-controller.ui
diff --git a/plugins/nintendo-64/src/nintendo-64-pak-controller.vala
b/plugins/nintendo-64/src/nintendo-64-pak-controller.vala
index 62e7ca2c..fa6a48a1 100644
--- a/plugins/nintendo-64/src/nintendo-64-pak-controller.vala
+++ b/plugins/nintendo-64/src/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/ui/nintendo-64-pak-controller.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/plugins/nintendo-64/nintendo-64-pak-controller.ui")]
private class Games.Nintendo64PakController : Gtk.Box {
[GtkChild]
private Gtk.Label title;
diff --git a/plugins/nintendo-64/data/ui/nintendo-64-pak-switcher.ui
b/plugins/nintendo-64/src/nintendo-64-pak-switcher.ui
similarity index 100%
rename from plugins/nintendo-64/data/ui/nintendo-64-pak-switcher.ui
rename to plugins/nintendo-64/src/nintendo-64-pak-switcher.ui
diff --git a/plugins/nintendo-64/src/nintendo-64-pak-switcher.vala
b/plugins/nintendo-64/src/nintendo-64-pak-switcher.vala
index 9d37b946..0a4b881c 100644
--- a/plugins/nintendo-64/src/nintendo-64-pak-switcher.vala
+++ b/plugins/nintendo-64/src/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/ui/nintendo-64-pak-switcher.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/plugins/nintendo-64/nintendo-64-pak-switcher.ui")]
private class Games.Nintendo64PakSwitcher : Gtk.Bin, HeaderBarWidget {
[GtkChild]
private Gtk.MenuButton menu_button;
diff --git a/plugins/nintendo-64/data/nintendo-64.gresource.xml
b/plugins/nintendo-64/src/nintendo-64.gresource.xml
similarity index 58%
rename from plugins/nintendo-64/data/nintendo-64.gresource.xml
rename to plugins/nintendo-64/src/nintendo-64.gresource.xml
index 7081e935..b3754164 100644
--- a/plugins/nintendo-64/data/nintendo-64.gresource.xml
+++ b/plugins/nintendo-64/src/nintendo-64.gresource.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/Games/plugins/nintendo-64">
- <file>ui/nintendo-64-pak-controller.ui</file>
- <file>ui/nintendo-64-pak-switcher.ui</file>
+ <file>nintendo-64-pak-controller.ui</file>
+ <file>nintendo-64-pak-switcher.ui</file>
</gresource>
</gresources>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]