0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1389 remove use of LD_LIBRARY_PATH for mmc libs

Browse Source
This commit is contained in:
Petr Mrázek
2016-01-04 01:37:46 +01:00
parent 8cf23bd5aa
commit 6f92ca843e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/CMakeLists.txt
View File

@@ -71,6 +71,11 @@ 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 ########

2
application/package/linux/MultiMC
View File

@@ -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_DIR}/bin":$MMC_LIBRARY_PATH
export LD_LIBRARY_PATH=$MMC_LIBRARY_PATH
export LD_PRELOAD=$MMC_PRELOAD
export QT_PLUGIN_PATH="${MMC_DIR}/plugins"
export QT_FONTPATH="${MMC_DIR}/fonts"