vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

platform/android: enable dynamic dladdr, fix build

Browse source
This commit is contained in:
mittorn 2020-07-08 08:45:24 +07:00
parent a5e3a74e93
commit bef873e1f8
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/defaults.h
View file

@ -69,6 +69,7 @@ SETUP BACKENDS DEFINITIONS
#endif // XASH_MESSAGEBOX #endif // XASH_MESSAGEBOX
#define XASH_USE_EVDEV #define XASH_USE_EVDEV
#define XASH_DYNAMIC_DLADDR
#elif XASH_LINUX #elif XASH_LINUX
// we are building for Linux without SDL2, can draw only to framebuffer yet // we are building for Linux without SDL2, can draw only to framebuffer yet
#ifndef XASH_VIDEO #ifndef XASH_VIDEO

18
engine/common/crashhandler.c
View file

@ -243,6 +243,24 @@ void Sys_RestoreCrashHandler( void )
#include <signal.h> #include <signal.h>
#include <sys/mman.h> #include <sys/mman.h>
#ifdef XASH_DYNAMIC_DLADDR
static int d_dladdr( void *sym, Dl_info *info )
{
static int (*dladdr_real) ( void *sym, Dl_info *info );
if( !dladdr_real )
dladdr_real = dlsym( (void*)(size_t)(-1), "dladdr" );
memset( info, 0, sizeof( *info ) );
if( !dladdr_real )
return -1;
return dladdr_real( sym, info );
}
#define dladdr d_dladdr
#endif
int printframe( char *buf, int len, int i, void *addr ) int printframe( char *buf, int len, int i, void *addr )
{ {
Dl_info dlinfo; Dl_info dlinfo;

5
engine/platform/posix/lib_posix.c
View file

@ -198,20 +198,21 @@ void *COM_FunctionFromName( void *hInstance, const char *pName )
} }
#ifdef XASH_DYNAMIC_DLADDR #ifdef XASH_DYNAMIC_DLADDR
int d_dladdr( void *sym, Dl_info *info ) static int d_dladdr( void *sym, Dl_info *info )
{ {
static int (*dladdr_real) ( void *sym, Dl_info *info ); static int (*dladdr_real) ( void *sym, Dl_info *info );
if( !dladdr_real ) if( !dladdr_real )
dladdr_real = dlsym( (void*)(size_t)(-1), "dladdr" ); dladdr_real = dlsym( (void*)(size_t)(-1), "dladdr" );
Q_memset( info, 0, sizeof( *info ) ); memset( info, 0, sizeof( *info ) );
if( !dladdr_real ) if( !dladdr_real )
return -1; return -1;
return dladdr_real( sym, info ); return dladdr_real( sym, info );
} }
#define dladdr d_dladdr
#endif #endif
const char *COM_NameForFunction( void *hInstance, void *function ) const char *COM_NameForFunction( void *hInstance, void *function )