summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-01-04 02:00:24 +0100
committerPetr Mrázek <peterix@gmail.com>2016-01-04 02:00:24 +0100
commitd1e344f28f643c9fb0318feea0259be8ac72c8f7 (patch)
treec6ea6d95ac575a7b9e940c4cd91a804d1c48f4e3 /application
parente0a9970d59728bdfa60753787775b0e0063533cb (diff)
downloadMultiMC-d1e344f28f643c9fb0318feea0259be8ac72c8f7.tar
MultiMC-d1e344f28f643c9fb0318feea0259be8ac72c8f7.tar.gz
MultiMC-d1e344f28f643c9fb0318feea0259be8ac72c8f7.tar.lz
MultiMC-d1e344f28f643c9fb0318feea0259be8ac72c8f7.tar.xz
MultiMC-d1e344f28f643c9fb0318feea0259be8ac72c8f7.zip
GH-1389 Revert "GH-1389 remove use of LD_LIBRARY_PATH for mmc libs"
This reverts commit 6f92ca843e6d1c4f8ef2be5ceba361cd74b79250.
Diffstat (limited to 'application')
-rw-r--r--application/CMakeLists.txt5
-rwxr-xr-xapplication/package/linux/MultiMC2
2 files changed, 1 insertions, 6 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 75f7d78e..65bee8c9 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -71,11 +71,6 @@ endif()
# directories to look for dependencies
set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-# Install RPATH - let's not use LD_LIBRARY_PATH
-if(UNIX AND NOT APPLE)
- set(CMAKE_INSTALL_RPATH "\\\$ORIGIN")
-endif()
-
################################ FILES ################################
######## Sources and headers ########
diff --git a/application/package/linux/MultiMC b/application/package/linux/MultiMC
index e807d4a4..9e1d7720 100755
--- a/application/package/linux/MultiMC
+++ b/application/package/linux/MultiMC
@@ -20,7 +20,7 @@ echo "MultiMC Dir: ${MMC_DIR}"
# Set up env - filter out input LD_ variables but pass them in under different names
export GAME_LIBRARY_PATH=${GAME_LIBRARY_PATH-${LD_LIBRARY_PATH}}
export GAME_PRELOAD=${GAME_PRELOAD-${LD_PRELOAD}}
-export LD_LIBRARY_PATH=$MMC_LIBRARY_PATH
+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"