meson: remove broken -Dwith_dlsym

The option does not even build, so let's remove it.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
pull/941/head
Emil Velikov 1 year ago committed by jackun
parent 5eb5d998f4
commit 8a1c56ba25

@ -12,7 +12,6 @@ option('with_xnvctrl', type : 'feature', value : 'enabled', description: 'Enable
option('with_x11', type : 'feature', value : 'enabled')
option('with_wayland', type : 'feature', value : 'disabled')
option('with_dbus', type : 'feature', value : 'enabled')
option('with_dlsym', type : 'feature', value : 'disabled')
option('loglevel', type: 'combo', choices : ['trace', 'debug', 'info', 'warn', 'err', 'critical', 'off'], value : 'info', description: 'Max log level in non-debug build')
option('mangoapp', type: 'boolean', value : false)
option('mangoapp_32bit', type: 'boolean', value : false)

@ -93,10 +93,6 @@ if is_unixy
'gl/inject_egl.cpp',
)
if get_option('with_dlsym').enabled()
pre_args += '-DHOOK_DLSYM'
endif
nvml_h_found = get_option('with_nvml') == 'enabled'
if get_option('with_nvml') == 'system'
nvml_h_found = cc.has_header('nvml.h')

@ -103,29 +103,3 @@ void* get_proc_address(const char* name) {
void (*func)() = (void (*)())real_dlsym(RTLD_NEXT, name);
return (void*)func;
}
#ifdef HOOK_DLSYM
EXPORT_C_(void *) mangohud_find_glx_ptr(const char *name);
EXPORT_C_(void *) mangohud_find_egl_ptr(const char *name);
EXPORT_C_(void*) dlsym(void * handle, const char * name)
{
void* func = nullptr;
#ifdef HAVE_X11
func = mangohud_find_glx_ptr(name);
if (func) {
//fprintf(stderr,"%s: local: %s\n", __func__ , name);
return func;
}
#endif
func = mangohud_find_egl_ptr(name);
if (func) {
//fprintf(stderr,"%s: local: %s\n", __func__ , name);
return func;
}
//fprintf(stderr,"%s: foreign: %s\n", __func__ , name);
return real_dlsym(handle, name);
}
#endif

Loading…
Cancel
Save