From b527ebbf5be0949df3b9dcf0806109acc8119476 Mon Sep 17 00:00:00 2001 From: rajdakin Date: Sat, 10 Feb 2024 15:06:08 +0100 Subject: Wrapped libraries refactor (#1257) * [MISC] Removed a warning caused by tab/space mismatch * [WRAPPED] Factored out `getMy` and `freeMy` calls * [WRAPPED] Small cleanup of the init header * [WRAPPED] Factored out `SETALT` * [WRAPPED] Factored out needed libs --- src/wrapped/wrappedgio2.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/wrapped/wrappedgio2.c') diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c index 07c86969..638bc14c 100644 --- a/src/wrapped/wrappedgio2.c +++ b/src/wrapped/wrappedgio2.c @@ -629,21 +629,14 @@ EXPORT void my_g_input_stream_read_async(x64emu_t* emu, void* stream, void* buff if(box64_nogtk) \ return -1; -#ifdef ANDROID #define CUSTOM_INIT \ - getMy(lib); \ SetGApplicationID(my->g_application_get_type()); \ - SetGDBusProxyID(my->g_dbus_proxy_get_type()); \ - setNeededLibs(lib, 1, "libgmodule-2.0.so"); + SetGDBusProxyID(my->g_dbus_proxy_get_type()); + +#ifdef ANDROID +#define NEEDED_LIBS "libgmodule-2.0.so" #else -#define CUSTOM_INIT \ - getMy(lib); \ - SetGApplicationID(my->g_application_get_type()); \ - SetGDBusProxyID(my->g_dbus_proxy_get_type()); \ - setNeededLibs(lib, 1, "libgmodule-2.0.so.0"); +#define NEEDED_LIBS "libgmodule-2.0.so.0" #endif -#define CUSTOM_FINI \ - freeMy(); - #include "wrappedlib_init.h" -- cgit 1.4.1