summaryrefslogtreecommitdiffstats
path: root/application/package/linux
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-06-12 09:40:41 +0200
committerPetr Mrázek <peterix@gmail.com>2015-06-12 09:40:41 +0200
commitf723721bd0fb7880878917d87b57e7357d6667e4 (patch)
treebd251734d370c7a004e68f0e45d0ca7a068ff931 /application/package/linux
parentb427a652adc7f300d8af3f5d566b851e2d2c30eb (diff)
downloadMultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.tar
MultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.tar.gz
MultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.tar.lz
MultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.tar.xz
MultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.zip
GH-1069 env hack/passthhrough for LD_PRELOAD and LD_LIBRARY_PATH
Diffstat (limited to 'application/package/linux')
-rwxr-xr-xapplication/package/linux/MultiMC7
1 files changed, 5 insertions, 2 deletions
diff --git a/application/package/linux/MultiMC b/application/package/linux/MultiMC
index 2e44a3ac..c131cb36 100755
--- a/application/package/linux/MultiMC
+++ b/application/package/linux/MultiMC
@@ -17,8 +17,11 @@ fi
MMC_DIR="$(dirname "$(readlink -f "$0")")"
echo "MultiMC Dir: ${MMC_DIR}"
-# Set up env
-export LD_LIBRARY_PATH="${MMC_DIR}/bin":$LD_LIBRARY_PATH
+# Set up env - filter out input LD_ variables but pass them in under different names
+export GAME_LIBRARY_PATH=$LD_LIBRARY_PATH
+export GAME_PRELOAD=$LD_PRELOAD
+export LD_LIBRARY_PATH="${MMC_DIR}/bin":$MMC_LIBRARY_PATH
+export LD_PRELOAD=$MMC_PRELOAD
export QT_PLUGIN_PATH="${MMC_DIR}/plugins"
export QT_FONTPATH="${MMC_DIR}/fonts"