Browse Source

Use the appropriate library path for whether the app is 32- or 64-bit in gamemoderun (#156)

Alex Smith 5 years ago
parent
commit
c6d1b45bfb
2 changed files with 5 additions and 6 deletions
  1. 4 5
      data/gamemoderun.in
  2. 1 1
      data/meson.build

+ 4 - 5
data/gamemoderun.in

@@ -1,11 +1,10 @@
 #!/bin/bash
 # Helper script to launch games with gamemode
 
-# Path to install gamemoded auto script
-CONFIG_LIB_DIR="@GAMEMODE_LIB_DIR@/libgamemodeauto.so.0"
+# Path to installed libgamemodeauto. ld.so will substitute "\$LIB" to get the
+# appropriate path depending on whether the app is 32- or 64-bit.
+GAMEMODEAUTO="@GAMEMODE_PREFIX@/\$LIB/libgamemodeauto.so.0"
 
-# Set the ld preload path prefixed libgamemodeauto
-export LD_PRELOAD="${CONFIG_LIB_DIR}${LD_PRELOAD:+:$LD_PRELOAD}"
+export LD_PRELOAD="${GAMEMODEAUTO}${LD_PRELOAD:+:$LD_PRELOAD}"
 
-# Launch
 exec "$@"

+ 1 - 1
data/meson.build

@@ -1,7 +1,7 @@
 data_conf = configuration_data()
 data_conf.set('BINDIR', path_bindir)
 data_conf.set('LIBEXECDIR', path_libexecdir)
-data_conf.set('GAMEMODE_LIB_DIR', path_libdir)
+data_conf.set('GAMEMODE_PREFIX', path_prefix)
 
 # Pull in the example config
 config_example = run_command(