[retro-gtk/c-port: 36/37] Fix public visibility
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk/c-port: 36/37] Fix public visibility
- Date: Wed, 27 Sep 2017 12:36:10 +0000 (UTC)
commit 48fdeec3762b6c2b396575c7055e337b77c8870a
Author: Adrien Plazas <kekun plazas laposte net>
Date: Tue Sep 26 14:39:35 2017 +0200
Fix public visibility
retro-gtk/Makefile.am | 44 +++++++++++++++++++++++-------------
retro-gtk/retro-module-iterator.c | 13 ++++++++--
retro-gtk/retro-module-iterator.h | 4 +-
3 files changed, 40 insertions(+), 21 deletions(-)
---
diff --git a/retro-gtk/Makefile.am b/retro-gtk/Makefile.am
index 9700878..f2ed574 100644
--- a/retro-gtk/Makefile.am
+++ b/retro-gtk/Makefile.am
@@ -54,13 +54,12 @@ libretro_gtk_la_LDFLAGS =
libretro_gtk_la_LIBADD = $(RETRO_GTK_LIBS)
-retro_gtkincludedir = $(includedir)/retro-gtk-0.12
-retro_gtkinclude_HEADERS = \
+public_headers = \
retro-analog-id.h \
retro-analog-index.h \
- retro-cairo-display.h \
retro-controller-iterator.h \
retro-core.h \
+ retro-core-descriptor.h \
retro-core-view.h \
retro-device-type.h \
retro-gtk.h \
@@ -74,9 +73,6 @@ retro_gtkinclude_HEADERS = \
retro-module-iterator.h \
retro-module-query.h \
retro-mouse-id.h \
- retro-option.h \
- retro-options.h \
- retro-pa-player.h \
retro-pixel-format.h \
retro-pointer-id.h \
retro-rumble-effect.h \
@@ -84,6 +80,28 @@ retro_gtkinclude_HEADERS = \
retro-video-filter.h \
$(NULL)
+private_headers = \
+ retro-cairo-display.h \
+ retro-core-private.h \
+ retro-core-view-input-device.h \
+ retro-disk-control-callback.h \
+ retro-game-info.h \
+ retro-keyboard-key.h \
+ retro-module.h \
+ retro-option.h \
+ retro-options.h \
+ retro-pa-player.h \
+ retro-rotation.h \
+ retro-system-av-info.h \
+ retro-system-info.h \
+ $(NULL)
+
+retro_gtkincludedir = $(includedir)/retro-gtk-0.12
+retro_gtkinclude_HEADERS = \
+ $(public_headers) \
+ $(private_headers) \
+ $(NULL)
+
# Introspection
-include $(INTROSPECTION_MAKEFILE)
@@ -99,7 +117,10 @@ gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-introspection_sources = $(retro_gtkinclude_HEADERS)
+introspection_sources = \
+ $(public_headers) \
+ $(libretro_gtk_la_SOURCES) \
+ $(NULL)
BUILT_SOURCES = libretro-gtk.la Retro-0.12.gir
@@ -131,15 +152,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = retro-gtk-0.12.pc
EXTRA_DIST = \
- retro-core-private.h \
- retro-core-view-input-device.h \
- retro-disk-control-callback.h \
- retro-game-info.h \
- retro-keyboard-key.h \
- retro-module.h \
- retro-rotation.h \
- retro-system-av-info.h \
- retro-system-info.h \
retro-gtk-0.12.pc.in \
update-from-retroarch.sh \
$(NULL)
diff --git a/retro-gtk/retro-module-iterator.c b/retro-gtk/retro-module-iterator.c
index 5a0045f..5de815f 100644
--- a/retro-gtk/retro-module-iterator.c
+++ b/retro-gtk/retro-module-iterator.c
@@ -307,16 +307,23 @@ retro_module_iterator_next (RetroModuleIterator *self)
return FALSE;
}
+/**
+ * retro_module_iterator_new:
+ * @lookup_paths: (array zero-terminated=1): paths where to look for Libretro cores
+ * @recursive: whether to look recursively into the sub-directories
+ *
+ * Returns: A new #ModuleIterator
+ */
RetroModuleIterator *
-retro_module_iterator_new (gchar **lookup_paths,
- gboolean recursive)
+retro_module_iterator_new (const gchar * const *lookup_paths,
+ gboolean recursive)
{
RetroModuleIterator *self;
g_return_val_if_fail (lookup_paths != NULL, NULL);
self = g_object_new (RETRO_TYPE_MODULE_ITERATOR, NULL);
- self->directories = g_strdupv (lookup_paths);
+ self->directories = g_strdupv ((gchar **) lookup_paths);
self->recursive = recursive;
self->visited = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
diff --git a/retro-gtk/retro-module-iterator.h b/retro-gtk/retro-module-iterator.h
index 11b4ccc..db93627 100644
--- a/retro-gtk/retro-module-iterator.h
+++ b/retro-gtk/retro-module-iterator.h
@@ -16,8 +16,8 @@ typedef struct _RetroCoreDescriptor RetroCoreDescriptor;
G_DECLARE_FINAL_TYPE (RetroModuleIterator, retro_module_iterator, RETRO, MODULE_ITERATOR, GObject)
-RetroModuleIterator *retro_module_iterator_new (gchar **lookup_paths,
- gboolean recursive);
+RetroModuleIterator *retro_module_iterator_new (const gchar * const *lookup_paths,
+ gboolean recursive);
RetroCoreDescriptor *retro_module_iterator_get (RetroModuleIterator *self);
gboolean retro_module_iterator_next (RetroModuleIterator *self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]