diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-03-07 11:11:47 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-03-07 11:11:47 +0100 |
| commit | 2b3c9b95af4ff056d05f4ed9aeb77e049bb844a5 (patch) | |
| tree | e444cfd26677a89a0c42cdf7222eb23d7a4610d3 /src/librarian | |
| parent | 09232ad0b63c360717f410e10b120ea38d84a12c (diff) | |
| download | box64-2b3c9b95af4ff056d05f4ed9aeb77e049bb844a5.tar.gz box64-2b3c9b95af4ff056d05f4ed9aeb77e049bb844a5.zip | |
Some work on gtk and co wrapping
Diffstat (limited to 'src/librarian')
| -rw-r--r-- | src/librarian/librarian.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librarian/librarian.c b/src/librarian/librarian.c index 4aff1864..56a0fffa 100644 --- a/src/librarian/librarian.c +++ b/src/librarian/librarian.c @@ -505,13 +505,13 @@ int GetGlobalSymbolStartEnd(lib_t *maplib, const char* name, uintptr_t* start, u } #ifndef STATICBUILD // some special case symbol, defined inside box64 itself - if(!strcmp(name, "gdk_display")) { + if(!strcmp(name, "gdk_display") && !box64_nogtk) { *start = (uintptr_t)my_GetGTKDisplay(); *end = *start+sizeof(void*); printf_log(LOG_INFO, "Using global gdk_display for gdk-x11 (%p:%p)\n", start, *(void**)start); return 1; } - if(!strcmp(name, "g_threads_got_initialized")) { + if(!strcmp(name, "g_threads_got_initialized") && !box64_nogtk) { *start = (uintptr_t)my_GetGthreadsGotInitialized(); *end = *start+sizeof(int); printf_log(LOG_INFO, "Using global g_threads_got_initialized for gthread2 (%p:%p)\n", start, *(void**)start); @@ -578,14 +578,14 @@ int GetGlobalWeakSymbolStartEnd(lib_t *maplib, const char* name, uintptr_t* star } #ifndef STATICBUILD // some special case symbol, defined inside box64 itself - if(!strcmp(name, "gdk_display")) { + if(!strcmp(name, "gdk_display") && !box64_nogtk) { *start = (uintptr_t)my_GetGTKDisplay(); *end = *start+sizeof(void*); if(elfsym) *elfsym = NULL; printf_log(LOG_INFO, "Using global gdk_display for gdk-x11 (%p:%p)\n", start, *(void**)start); return 1; } - if(!strcmp(name, "g_threads_got_initialized")) { + if(!strcmp(name, "g_threads_got_initialized") && !box64_nogtk) { *start = (uintptr_t)my_GetGthreadsGotInitialized(); *end = *start+sizeof(int); if(elfsym) *elfsym = NULL; |