diff options
| author | KreitinnSoftware <80591934+KreitinnSoftware@users.noreply.github.com> | 2023-10-02 13:26:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-02 18:26:20 +0200 |
| commit | 57b762eb2976229a1297bd39a00976b3753de4d7 (patch) | |
| tree | bd206d2c812c9e400d933e61486aa1d27cb3927c /src/wrapped/wrappedlibxext.c | |
| parent | a4eb0cbd74423b7bdbeb3189c12905340108ec50 (diff) | |
| download | box64-57b762eb2976229a1297bd39a00976b3753de4d7.tar.gz box64-57b762eb2976229a1297bd39a00976b3753de4d7.zip | |
Add __sF, __assert2 Symbol and set PThread Symbols on libc (#1004)
* Add __sF, __assert2 Symbol and set PThread Symbols on libc * [ANDROID] Fix Most Library Names
Diffstat (limited to 'src/wrapped/wrappedlibxext.c')
| -rw-r--r-- | src/wrapped/wrappedlibxext.c | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/src/wrapped/wrappedlibxext.c b/src/wrapped/wrappedlibxext.c index 245b65ce..06088a83 100644 --- a/src/wrapped/wrappedlibxext.c +++ b/src/wrapped/wrappedlibxext.c @@ -17,7 +17,12 @@ #include "box64context.h" #include "emu/x64emu_private.h" -const char* libxextName = "libXext.so.6"; +#ifdef ANDROID + const char* libxextName = "libXext.so"; +#else + const char* libxextName = "libXext.so.6"; +#endif + #define LIBNAME libxext typedef struct _XImage XImage; @@ -385,14 +390,25 @@ EXPORT void* my_XextAddDisplay(x64emu_t* emu, void* extinfo, void* dpy, void* ex return ret; } -#define CUSTOM_INIT \ - getMy(lib); \ - setNeededLibs(lib, 5, \ - "libX11.so.6", \ - "libxcb.so.1", \ - "libXau.so.6", \ - "libdl.so.2", \ - "libXdmcp.so.6"); +#ifdef ANDROID + #define CUSTOM_INIT \ + getMy(lib); \ + setNeededLibs(lib, 5, \ + "libX11.so", \ + "libxcb.so", \ + "libXau.so", \ + "libdl.so", \ + "libXdmcp.so"); +#else + #define CUSTOM_INIT \ + getMy(lib); \ + setNeededLibs(lib, 5, \ + "libX11.so.6", \ + "libxcb.so.1", \ + "libXau.so.6", \ + "libdl.so.2", \ + "libXdmcp.so.6"); +#endif #define CUSTOM_FINI \ freeMy(); |