GNOME.org
 

[retro-gtk] Rename retro-gobject as retro-gtk

commit 80681d91a2064db77e3377c2b742aef0ffabd128
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Mon Feb 13 11:54:25 2017 +0100

    Rename retro-gobject as retro-gtk
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777489

 Makefile.am                                        |    2 +-
 configure.ac                                       |   13 +--
 retro-gobject/Makefile.am                          |  148 ------------------
 retro-gobject/retro-core.c                         |  160 --------------------
 retro-gtk/Makefile.am                              |  102 +++++++++----
 {retro-gobject => retro-gtk}/audio/pa-player.vala  |    0
 {retro-gobject => retro-gtk}/av-info.vala          |    0
 {retro-gobject => retro-gtk}/core-error.vala       |    0
 {retro-gobject => retro-gtk}/core.vala             |    0
 {retro-gobject => retro-gtk}/disk-controller.vala  |    0
 {retro-gobject => retro-gtk}/game-info.vala        |    0
 {retro-gobject => retro-gtk}/input/controller.vala |    0
 {retro-gobject => retro-gtk}/input/device.vala     |    0
 .../input/gamepad-button-type.vala                 |    0
 .../input/gamepad-configuration.vala               |    0
 .../input/input-device-manager.vala                |    0
 .../input/input-device.vala                        |    0
 {retro-gobject => retro-gtk}/input/input.vala      |    0
 .../input/keyboard-state.vala                      |    0
 {retro-gobject => retro-gtk}/input/keyboard.vala   |    0
 {retro-gobject => retro-gtk}/input/mouse.vala      |    0
 .../input/virtual-gamepad.vala                     |    0
 .../libretro-environment.h                         |    0
 {retro-gobject => retro-gtk}/libretro.h            |    0
 .../log/file-stream-log.vala                       |    0
 {retro-gobject => retro-gtk}/log/log.vala          |    0
 {retro-gobject => retro-gtk}/loop/main-loop.vala   |    0
 {retro-gobject => retro-gtk}/memory.vala           |    0
 {retro-gobject => retro-gtk}/module.vala           |    0
 .../retro-core-descriptor-error.vala               |    0
 .../retro-core-descriptor.vala                     |    0
 {retro-gobject => retro-gtk}/retro-environment.c   |    0
 .../retro-gobject-0.8.deps                         |    0
 .../retro-gobject-0.8.pc.in                        |    0
 retro-gtk/retro-gtk-0.8.deps                       |    9 -
 retro-gtk/retro-gtk-0.8.pc.in                      |   13 --
 .../retro-module-query.vala                        |    0
 {retro-gobject => retro-gtk}/retro.vala            |    0
 {retro-gobject => retro-gtk}/rumble.vala           |    0
 {retro-gobject => retro-gtk}/system-info.vala      |    0
 {retro-gobject => retro-gtk}/vapi/config.vapi      |    0
 {retro-gobject => retro-gtk}/variable/options.vala |    0
 .../variable/variables.vala                        |    0
 {retro-gobject => retro-gtk}/video.vala            |    0
 .../video/cairo-display.vala                       |    0
 .../video/retro-video-converter.c                  |    0
 .../video/video-filter.vala                        |    0
 47 files changed, 70 insertions(+), 377 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e763ce4..273c787 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 NULL =
 
-SUBDIRS = retro-gobject po
+SUBDIRS = retro-gtk po
 
 dist_doc_DATA = \
        README \
diff --git a/configure.ac b/configure.ac
index 6b22334..53c3025 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,21 +34,12 @@ AC_DISABLE_STATIC
 LT_INIT
 
 
-###############
-# retro-gobject
-###############
-
-retro_gobject_pkg_modules="gobject-2.0 glib-2.0 gmodule-2.0 gio-2.0 gtk+-3.0 cairo libpulse libpulse-simple"
-PKG_CHECK_MODULES(RETRO_GOBJECT, $retro_gobject_pkg_modules)
-AC_SUBST(retro_gobject_pkg_modules)
-
 ###########
 # retro-gtk
 ###########
 
-retro_gtk_pkg_modules="gobject-2.0 glib-2.0"
+retro_gtk_pkg_modules="gobject-2.0 glib-2.0 gmodule-2.0 gio-2.0 gtk+-3.0 cairo libpulse libpulse-simple"
 PKG_CHECK_MODULES(RETRO_GTK, $retro_gtk_pkg_modules)
-retro_gtk_pkg_modules="$retro_gtk_pkg_modules retro-gobject-0.8"
 AC_SUBST(retro_gtk_pkg_modules)
 
 
@@ -57,8 +48,6 @@ AC_SUBST(retro_gtk_pkg_modules)
 
 AC_OUTPUT([
 Makefile
-retro-gobject/retro-gobject-0.8.pc
-retro-gobject/Makefile
 retro-gtk/retro-gtk-0.8.pc
 retro-gtk/Makefile
 po/Makefile.in])
diff --git a/retro-gtk/Makefile.am b/retro-gtk/Makefile.am
index 3c3c45e..b18c837 100644
--- a/retro-gtk/Makefile.am
+++ b/retro-gtk/Makefile.am
@@ -6,9 +6,12 @@ AM_CPPFLAGS = \
        -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
        -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
        -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
-       -DRETRO_GOBJECT_USE_UNSTABLE_API \
-       -I$(top_srcdir)/retro-gobject \
-       $(RETRO_GTK_CFLAGS) \
+       -DPROJECT_NAME=\""retro"\" \
+       -DPROJECT_API_VERSION=\""0.8"\" \
+       -DPROJECT_DIR_NAME=\""retro-1.0"\" \
+       -DPROJECT_PLUGINS_DIR=\""$(libdir)/retro-1.0/plugins"\" \
+       -DRETRO_PLUGIN_PATH=\""$(libdir)/retro-1.0/plugins:$(libdir)/libretro:$(libdir)"\" \
+       $(retro_gtk_CFLAGS) \
        $(NULL)
 
 AM_CFLAGS =\
@@ -21,41 +24,81 @@ lib_LTLIBRARIES = libretro-gtk.la
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = retro-gtk-0.8.vapi retro-gtk-0.8.deps
 
-BUILT_SOURCES =
+BUILT_SOURCES = retro-gtk-internal.h
 
 libretro_gtk_la_SOURCES = \
+       audio/pa-player.vala \
+       \
+       input/controller.vala \
+       input/device.vala \
        input/gamepad-button-type.vala \
        input/gamepad-configuration.vala \
+       input/input.vala \
+       input/input-device.vala \
        input/input-device-manager.vala \
        input/keyboard.vala \
        input/keyboard-state.vala \
        input/mouse.vala \
        input/virtual-gamepad.vala \
+       \
+       log/file-stream-log.vala \
+       log/log.vala \
+       \
+       loop/main-loop.vala \
+       \
+       variable/options.vala \
+       variable/variables.vala \
+       \
+       av-info.vala \
+       core.vala \
+       core-error.vala \
+       disk-controller.vala \
+       game-info.vala \
+       memory.vala \
+       module.vala \
+       retro.vala \
+       retro-core-descriptor.vala \
+       retro-core-descriptor-error.vala \
+       retro-module-query.vala \
+       rumble.vala \
+       system-info.vala \
+       video.vala \
+       retro-core.c \
+       retro-environment.c \
+       libretro-environment.h \
+       \
+       video/cairo-display.vala \
+       video/retro-video-converter.c \
+       video/video-filter.vala \
        $(NULL)
 
+retro-core.c: retro-gtk-internal.h
+
+retro-environment.c: retro-gtk-internal.h libretro-environment.h
+
 libretro_gtk_la_LDFLAGS =
 
 libretro_gtk_la_VALAFLAGS = \
-       --vapidir $(top_builddir)/retro-gobject \
+       --pkg cairo \
+       --pkg config \
+       --pkg gio-2.0  \
        --pkg glib-2.0 \
+       --pkg gmodule-2.0 \
        --pkg gobject-2.0 \
-       --pkg retro-gobject-0.8 \
+       --pkg gtk+-3.0 \
+       --pkg libpulse \
+       --pkg libpulse-simple \
+       --vapidir=vapi \
        --thread \
        --target-glib 2.32 \
        --library retro-gtk-0.8 \
        --vapi retro-gtk-0.8.vapi \
        -H retro-gtk.h \
+       -h retro-gtk-internal.h \
        -X -fPIC -X -shared \
        $(NULL)
 
-libretro_gtk_la_LIBADD = \
-       $(top_builddir)/retro-gobject/libretro-gobject.la \
-       $(RETRO_GTK_LIBS) \
-       $(NULL)
-
-libretro_gtk_la_DEPENDENCIES = \
-       $(top_builddir)/retro-gobject/libretro-gobject.la \
-       $(NULL)
+libretro_gtk_la_LIBADD = $(retro_gtk_LIBS)
 
 retro_gtkincludedir = $(includedir)/retro-gtk-0.8
 retro_gtkinclude_HEADERS = \
@@ -64,20 +107,16 @@ retro_gtkinclude_HEADERS = \
 
 # Add unstable API guard
 $(outdir)/retro-gtk.h:
-       sed -i "s/#define __RETRO_GTK_H__/#define __RETRO_GTK_H__\n\n#ifndef 
RETRO_GTK_USE_UNSTABLE_API\n#error    RetroGtk is unstable API. You must define RETRO_GTK_USE_UNSTABLE_API 
before including retro-gtk.h\n#endif/" $@
+       sed -i "s/#define __retro_gtk_H__/#define __retro_gtk_H__\n\n#ifndef 
retro_gtk_USE_UNSTABLE_API\n#error    Retro is unstable API. You must define retro_gtk_USE_UNSTABLE_API 
before including retro-gtk.h\n#endif/" $@
 
 # Introspection
 -include $(INTROSPECTION_MAKEFILE)
 
-RetroGtk-0.8.gir: $(INTROSPECTION_SCANNER) libretro-gtk.la $(top_builddir)/retro-gobject/libretro-gobject.la 
$(top_builddir)/retro-gobject/Retro-0.8.gir
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
-INTROSPECTION_COMPILER_ARGS = \
-       --includedir=$(srcdir) \
-       --includedir=$(top_builddir)/retro-gobject \
-       $(NULL)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
-INTROSPECTION_GIRS += RetroGtk-0.8.gir
+INTROSPECTION_GIRS += Retro-0.8.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -87,20 +126,15 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 introspection_sources = $(retro_gtkinclude_HEADERS)
 
-BUILT_SOURCES += libretro-gtk.la RetroGtk-0.8.gir
+BUILT_SOURCES += libretro-gtk.la Retro-0.8.gir
 
-RetroGtk_0_8_gir_INCLUDES = GLib-2.0 GObject-2.0 Gtk-3.0 cairo-1.0 Retro-0.8
-RetroGtk_0_8_gir_SCANNERFLAGS = \
-       --c-include=retro-gtk.h \
-       --pkg-export=retro-gtk-0.8 \
-       -I$(top_builddir)/retro-gobject \
-       --add-include-path=$(top_builddir)/retro-gobject \
-       --include-uninstalled=$(top_builddir)/retro-gobject/Retro-0.8.gir \
-       $(NULL)
-RetroGtk_0_8_gir_CFLAGS = -DRETRO_GTK_USE_UNSTABLE_API $(AM_CPPFLAGS)
-RetroGtk_0_8_gir_LIBS = libretro-gtk.la
-RetroGtk_0_8_gir_FILES = $(introspection_sources)
-RetroGtk_0_8_gir_EXPORT_PACKAGES = retro-gtk-0.8
+Retro-0.8.gir: $(INTROSPECTION_SCANNER) libretro-gtk.la
+Retro_0_8_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
+Retro_0_8_gir_SCANNERFLAGS = --c-include=retro-gtk.h --pkg-export=retro-gtk-0.8
+Retro_0_8_gir_CFLAGS = -Dretro_gtk_USE_UNSTABLE_API $(retro_gtk_CFLAGS)
+Retro_0_8_gir_LIBS = libretro-gtk.la
+Retro_0_8_gir_FILES = $(introspection_sources)
+Retro_0_8_gir_EXPORT_PACKAGES = retro-gtk-0.8
 
 CLEANFILES = $(gir_DATA) $(typelib_DATA)
 
diff --git a/retro-gobject/audio/pa-player.vala b/retro-gtk/audio/pa-player.vala
similarity index 100%
rename from retro-gobject/audio/pa-player.vala
rename to retro-gtk/audio/pa-player.vala
diff --git a/retro-gobject/av-info.vala b/retro-gtk/av-info.vala
similarity index 100%
rename from retro-gobject/av-info.vala
rename to retro-gtk/av-info.vala
diff --git a/retro-gobject/core-error.vala b/retro-gtk/core-error.vala
similarity index 100%
rename from retro-gobject/core-error.vala
rename to retro-gtk/core-error.vala
diff --git a/retro-gobject/core.vala b/retro-gtk/core.vala
similarity index 100%
rename from retro-gobject/core.vala
rename to retro-gtk/core.vala
diff --git a/retro-gobject/disk-controller.vala b/retro-gtk/disk-controller.vala
similarity index 100%
rename from retro-gobject/disk-controller.vala
rename to retro-gtk/disk-controller.vala
diff --git a/retro-gobject/game-info.vala b/retro-gtk/game-info.vala
similarity index 100%
rename from retro-gobject/game-info.vala
rename to retro-gtk/game-info.vala
diff --git a/retro-gobject/input/controller.vala b/retro-gtk/input/controller.vala
similarity index 100%
rename from retro-gobject/input/controller.vala
rename to retro-gtk/input/controller.vala
diff --git a/retro-gobject/input/device.vala b/retro-gtk/input/device.vala
similarity index 100%
rename from retro-gobject/input/device.vala
rename to retro-gtk/input/device.vala
diff --git a/retro-gobject/input/gamepad-button-type.vala b/retro-gtk/input/gamepad-button-type.vala
similarity index 100%
rename from retro-gobject/input/gamepad-button-type.vala
rename to retro-gtk/input/gamepad-button-type.vala
diff --git a/retro-gobject/input/gamepad-configuration.vala b/retro-gtk/input/gamepad-configuration.vala
similarity index 100%
rename from retro-gobject/input/gamepad-configuration.vala
rename to retro-gtk/input/gamepad-configuration.vala
diff --git a/retro-gobject/input/input-device-manager.vala b/retro-gtk/input/input-device-manager.vala
similarity index 100%
rename from retro-gobject/input/input-device-manager.vala
rename to retro-gtk/input/input-device-manager.vala
diff --git a/retro-gobject/input/input-device.vala b/retro-gtk/input/input-device.vala
similarity index 100%
rename from retro-gobject/input/input-device.vala
rename to retro-gtk/input/input-device.vala
diff --git a/retro-gobject/input/input.vala b/retro-gtk/input/input.vala
similarity index 100%
rename from retro-gobject/input/input.vala
rename to retro-gtk/input/input.vala
diff --git a/retro-gobject/input/keyboard-state.vala b/retro-gtk/input/keyboard-state.vala
similarity index 100%
rename from retro-gobject/input/keyboard-state.vala
rename to retro-gtk/input/keyboard-state.vala
diff --git a/retro-gobject/input/keyboard.vala b/retro-gtk/input/keyboard.vala
similarity index 100%
rename from retro-gobject/input/keyboard.vala
rename to retro-gtk/input/keyboard.vala
diff --git a/retro-gobject/input/mouse.vala b/retro-gtk/input/mouse.vala
similarity index 100%
rename from retro-gobject/input/mouse.vala
rename to retro-gtk/input/mouse.vala
diff --git a/retro-gobject/input/virtual-gamepad.vala b/retro-gtk/input/virtual-gamepad.vala
similarity index 100%
rename from retro-gobject/input/virtual-gamepad.vala
rename to retro-gtk/input/virtual-gamepad.vala
diff --git a/retro-gobject/libretro-environment.h b/retro-gtk/libretro-environment.h
similarity index 100%
rename from retro-gobject/libretro-environment.h
rename to retro-gtk/libretro-environment.h
diff --git a/retro-gobject/libretro.h b/retro-gtk/libretro.h
similarity index 100%
rename from retro-gobject/libretro.h
rename to retro-gtk/libretro.h
diff --git a/retro-gobject/log/file-stream-log.vala b/retro-gtk/log/file-stream-log.vala
similarity index 100%
rename from retro-gobject/log/file-stream-log.vala
rename to retro-gtk/log/file-stream-log.vala
diff --git a/retro-gobject/log/log.vala b/retro-gtk/log/log.vala
similarity index 100%
rename from retro-gobject/log/log.vala
rename to retro-gtk/log/log.vala
diff --git a/retro-gobject/loop/main-loop.vala b/retro-gtk/loop/main-loop.vala
similarity index 100%
rename from retro-gobject/loop/main-loop.vala
rename to retro-gtk/loop/main-loop.vala
diff --git a/retro-gobject/memory.vala b/retro-gtk/memory.vala
similarity index 100%
rename from retro-gobject/memory.vala
rename to retro-gtk/memory.vala
diff --git a/retro-gobject/module.vala b/retro-gtk/module.vala
similarity index 100%
rename from retro-gobject/module.vala
rename to retro-gtk/module.vala
diff --git a/retro-gobject/retro-core-descriptor-error.vala b/retro-gtk/retro-core-descriptor-error.vala
similarity index 100%
rename from retro-gobject/retro-core-descriptor-error.vala
rename to retro-gtk/retro-core-descriptor-error.vala
diff --git a/retro-gobject/retro-core-descriptor.vala b/retro-gtk/retro-core-descriptor.vala
similarity index 100%
rename from retro-gobject/retro-core-descriptor.vala
rename to retro-gtk/retro-core-descriptor.vala
diff --git a/retro-gobject/retro-environment.c b/retro-gtk/retro-environment.c
similarity index 100%
rename from retro-gobject/retro-environment.c
rename to retro-gtk/retro-environment.c
diff --git a/retro-gobject/retro-gobject-0.8.deps b/retro-gtk/retro-gobject-0.8.deps
similarity index 100%
rename from retro-gobject/retro-gobject-0.8.deps
rename to retro-gtk/retro-gobject-0.8.deps
diff --git a/retro-gobject/retro-gobject-0.8.pc.in b/retro-gtk/retro-gobject-0.8.pc.in
similarity index 100%
rename from retro-gobject/retro-gobject-0.8.pc.in
rename to retro-gtk/retro-gobject-0.8.pc.in
diff --git a/retro-gobject/retro-module-query.vala b/retro-gtk/retro-module-query.vala
similarity index 100%
rename from retro-gobject/retro-module-query.vala
rename to retro-gtk/retro-module-query.vala
diff --git a/retro-gobject/retro.vala b/retro-gtk/retro.vala
similarity index 100%
rename from retro-gobject/retro.vala
rename to retro-gtk/retro.vala
diff --git a/retro-gobject/rumble.vala b/retro-gtk/rumble.vala
similarity index 100%
rename from retro-gobject/rumble.vala
rename to retro-gtk/rumble.vala
diff --git a/retro-gobject/system-info.vala b/retro-gtk/system-info.vala
similarity index 100%
rename from retro-gobject/system-info.vala
rename to retro-gtk/system-info.vala
diff --git a/retro-gobject/vapi/config.vapi b/retro-gtk/vapi/config.vapi
similarity index 100%
rename from retro-gobject/vapi/config.vapi
rename to retro-gtk/vapi/config.vapi
diff --git a/retro-gobject/variable/options.vala b/retro-gtk/variable/options.vala
similarity index 100%
rename from retro-gobject/variable/options.vala
rename to retro-gtk/variable/options.vala
diff --git a/retro-gobject/variable/variables.vala b/retro-gtk/variable/variables.vala
similarity index 100%
rename from retro-gobject/variable/variables.vala
rename to retro-gtk/variable/variables.vala
diff --git a/retro-gobject/video.vala b/retro-gtk/video.vala
similarity index 100%
rename from retro-gobject/video.vala
rename to retro-gtk/video.vala
diff --git a/retro-gobject/video/cairo-display.vala b/retro-gtk/video/cairo-display.vala
similarity index 100%
rename from retro-gobject/video/cairo-display.vala
rename to retro-gtk/video/cairo-display.vala
diff --git a/retro-gobject/video/retro-video-converter.c b/retro-gtk/video/retro-video-converter.c
similarity index 100%
rename from retro-gobject/video/retro-video-converter.c
rename to retro-gtk/video/retro-video-converter.c
diff --git a/retro-gobject/video/video-filter.vala b/retro-gtk/video/video-filter.vala
similarity index 100%
rename from retro-gobject/video/video-filter.vala
rename to retro-gtk/video/video-filter.vala
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]