Adjusted dependancies for some X11 libs

4 files changed, 20 insertions, 2 deletions

diff --git a/src/wrapped/wrappedlibx11.c b/src/wrapped/wrappedlibx11.c
index ed27c456..90f6e662 100644
--- a/src/wrapped/wrappedlibx11.c
+++ b/src/wrapped/wrappedlibx11.c
@@ -1441,4 +1441,10 @@ EXPORT void* my_XOpenDisplay(x64emu_t* emu, void* d)
 #define CUSTOM_INIT                 \
     if(box64_x11threads) my->XInitThreads();
 
+#ifdef ANDROID
+#define NEEDED_LIBS "libxcb.so"
+#else
+#define NEEDED_LIBS "libxcb.so.1"
+#endif
+
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxcb.c b/src/wrapped/wrappedlibxcb.c
index f049dac4..46b78d7e 100644
--- a/src/wrapped/wrappedlibxcb.c
+++ b/src/wrapped/wrappedlibxcb.c
@@ -42,4 +42,10 @@ EXPORT void my_xcb_disconnect(x64emu_t* emu, void* conn)
 	del_xcb_connection(conn);
 }
 
+#ifdef ANDROID
+#define NEEDED_LIBS "libXau.so", "libXdmcp.so"
+#else
+#define NEEDED_LIBS "libXau.so.6", "libXdmcp.so.6"
+#endif
+
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxcursor.c b/src/wrapped/wrappedlibxcursor.c
index be87d56b..b70911a8 100644
--- a/src/wrapped/wrappedlibxcursor.c
+++ b/src/wrapped/wrappedlibxcursor.c
@@ -19,5 +19,11 @@
 
 #define LIBNAME libxcursor
 
+#ifdef ANDROID
+#define NEEDED_LIBS "libX11.so", "libXfixes.so", "libXrender.so"
+#else
+#define NEEDED_LIBS "libX11.so.6", "libXfixes.so.3", "libXrender.so.1"
+#endif
+
 #include "wrappedlib_init.h"
 
diff --git a/src/wrapped/wrappedlibxrender.c b/src/wrapped/wrappedlibxrender.c
index e6eb2df8..3c25b2df 100644
--- a/src/wrapped/wrappedlibxrender.c
+++ b/src/wrapped/wrappedlibxrender.c
@@ -20,9 +20,9 @@
 #define LIBNAME libxrender
 
 #ifdef ANDROID
-#define NEEDED_LIBS "libX11.so", "libxcb.so", "libXau.so", "libXdmcp.so"
+#define NEEDED_LIBS "libX11.so"
 #else
-#define NEEDED_LIBS "libX11.so.6", "libxcb.so.1", "libXau.so.6", "libXdmcp.so.6"
+#define NEEDED_LIBS "libX11.so.6"
 #endif
 
 #include "wrappedlib_init.h"