diff options
| author | KreitinnSoftware <80591934+KreitinnSoftware@users.noreply.github.com> | 2024-02-06 08:26:50 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-06 12:26:50 +0100 |
| commit | 16423270154ab75987b05723ae45f30cdd8a0e3d (patch) | |
| tree | 68a15bc90574814d89ce7e532905498f27852908 /src/wrapped/wrappedgobject2.c | |
| parent | 399478d635c352a986aaa891ac824d840ae19e56 (diff) | |
| download | box64-16423270154ab75987b05723ae45f30cdd8a0e3d.tar.gz box64-16423270154ab75987b05723ae45f30cdd8a0e3d.zip | |
[ANDROID] Fix GLib and GObject Library Names (#1247)
* [ANDROID] Fix GLib and GObject Library Names * [ANDROID] Fix gdk3, gdkpixbuf2, gio2, gmodule2, gtkx112, gdkx112, pangocairo Library Names
Diffstat (limited to 'src/wrapped/wrappedgobject2.c')
| -rw-r--r-- | src/wrapped/wrappedgobject2.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c index 2371e011..19091269 100644 --- a/src/wrapped/wrappedgobject2.c +++ b/src/wrapped/wrappedgobject2.c @@ -19,7 +19,11 @@ #include "gtkclass.h" #include "myalign.h" -const char* gobject2Name = "libgobject-2.0.so.0"; +#ifdef ANDROID + const char* gobject2Name = "libgobject-2.0.so"; +#else + const char* gobject2Name = "libgobject-2.0.so.0"; +#endif #define LIBNAME gobject2 typedef size_t(*LFv_t)(void); @@ -924,6 +928,17 @@ EXPORT void* my_g_type_value_table_peek(x64emu_t* emu, size_t type) if(box64_nogtk) \ return -1; +#ifdef ANDROID +#define CUSTOM_INIT \ + InitGTKClass(lib->w.bridge); \ + getMy(lib); \ + SetGObjectID(my->g_object_get_type()); \ + SetGInitiallyUnownedID(my->g_initially_unowned_get_type()); \ + SetGTypeName(my->g_type_name); \ + SetGClassPeek(my->g_type_class_peek); \ + SetGTypeParent(my->g_type_parent); \ + setNeededLibs(lib, 1, "libglib-2.0.so"); +#else #define CUSTOM_INIT \ InitGTKClass(lib->w.bridge); \ getMy(lib); \ @@ -933,6 +948,7 @@ EXPORT void* my_g_type_value_table_peek(x64emu_t* emu, size_t type) SetGClassPeek(my->g_type_class_peek); \ SetGTypeParent(my->g_type_parent); \ setNeededLibs(lib, 1, "libglib-2.0.so.0"); +#endif #define CUSTOM_FINI \ FiniGTKClass(); \ |