Add option to change lib dir in gamemoderun

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
This commit is contained in:
Stephan Lachnit 2020-04-22 13:13:33 +02:00 committed by afayaz-feral
parent 1709810707
commit 1e8312f7e3
3 changed files with 12 additions and 1 deletions

View File

@ -3,7 +3,7 @@
# Path to installed libgamemodeauto. ld.so will substitute "\$LIB" to get the # Path to installed libgamemodeauto. ld.so will substitute "\$LIB" to get the
# appropriate path depending on whether the app is 32- or 64-bit. # appropriate path depending on whether the app is 32- or 64-bit.
GAMEMODEAUTO="@GAMEMODE_PREFIX@/\$LIB/libgamemodeauto.so.0" GAMEMODEAUTO="@GAMEMODERUN_PREFIX@libgamemodeauto.so.0"
LD_PRELOAD="${GAMEMODEAUTO}${LD_PRELOAD:+:$LD_PRELOAD}" LD_PRELOAD="${GAMEMODEAUTO}${LD_PRELOAD:+:$LD_PRELOAD}"

View File

@ -3,6 +3,14 @@ data_conf.set('BINDIR', path_bindir)
data_conf.set('LIBEXECDIR', path_libexecdir) data_conf.set('LIBEXECDIR', path_libexecdir)
data_conf.set('GAMEMODE_PREFIX', path_prefix) data_conf.set('GAMEMODE_PREFIX', path_prefix)
# Set gamemoderun lib dir
gamemoderun_lib_dir = get_option('with-gamemoderun-lib-dir')
if gamemoderun_lib_dir == 'default'
data_conf.set('GAMEMODERUN_PREFIX', path_prefix + '/\$LIB/')
else
data_conf.set('GAMEMODERUN_PREFIX', gamemoderun_lib_dir)
endif
# Pull in the example config # Pull in the example config
config_example = run_command( config_example = run_command(
'cat', 'cat',

View File

@ -9,6 +9,9 @@ option('with-systemd-user-unit-dir', type: 'string', description: 'Explicitly se
# Not using systemd # Not using systemd
option('with-dbus-service-dir', type: 'string', description: 'Explicitly set the D-BUS session directory') option('with-dbus-service-dir', type: 'string', description: 'Explicitly set the D-BUS session directory')
# lib dir in gamemoderun
option('with-gamemoderun-lib-dir', type: 'string', value: 'default', description: 'Explicitly set lib dir in gamemoderun')
# General options # General options
option('with-examples', type: 'boolean', description: 'Build sample programs', value: 'true') option('with-examples', type: 'boolean', description: 'Build sample programs', value: 'true')
option('with-daemon', type: 'boolean', description: 'Build the daemon', value: 'true') option('with-daemon', type: 'boolean', description: 'Build the daemon', value: 'true')