GH-1389 remove use of LD_LIBRARY_PATH for mmc libs
This commit is contained in:
parent
8cf23bd5aa
commit
6f92ca843e
@ -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 ########
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user