fixup! Add LD_LIBRARY_PATH

This adds CHROMIUM_EFL_DEPENDENCIES_LIBDIR.

Change-Id: Ie6ae3c015a570212099aa5b3e66b0c337d9941dc
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/efl/build/desktop/launch.sh b/efl/build/desktop/launch.sh
index b01c05f..53a5199 100755 (executable)
--- a/efl/build/desktop/launch.sh
+++ b/efl/build/desktop/launch.sh
@@ -2,16 +2,16 @@
 
 EXECUTABLE=$1
 
-CHROMIUM_EFL_PATH=$(echo "$@" | grep -Po "(?<=\--chromium-efl-path=)[^\s]*" || :)
+CHROMIUM_EFL_LIBDIR=$(echo "$@" | grep -Po "(?<=\--chromium-efl-path=)[^\s]*" || :)
 APP_PATH=$(echo "$@" | grep -Po "(?<=\--app-path=)[^\s]*" || :)
 
-if [[ "$CHROMIUM_EFL_PATH" == "" ]]; then
+if [[ "$CHROMIUM_EFL_LIBDIR" == "" ]]; then
   echo "Please add --chromium-efl-path=/PATH/TO/chromium-efl"
   exit 1
 fi
-CHROMIUM_EFL_PATH=$CHROMIUM_EFL_PATH/out.x64
+CHROMIUM_EFL_LIBDIR=$CHROMIUM_EFL_LIBDIR/out.x64
 
-echo "CHROMIUM_EFL_PATH: $CHROMIUM_EFL_PATH"
+echo "CHROMIUM_EFL_LIBDIR: $CHROMIUM_EFL_LIBDIR"
 echo "APP_PATH: $APP_PATH"
 
 if [ ! $EXECUTABLE ]; then
@@ -31,6 +31,7 @@ fi
 
 SCRIPTDIR=$(readlink -e $(dirname $0))
 OUT_DIR=$(echo $SCRIPTDIR | grep -Po "(?<=/)out\..*?(?=/)")
+CHROMIUM_EFL_DEPENDENCIES_LIBDIR=$(readlink -e $CHROMIUM_EFL_LIBDIR/Dependencies/Root/$_LIBDIR)
 
 if echo $SCRIPTDIR | grep -qw "Debug"; then
   BUILD_MODE=Debug
@@ -45,7 +46,7 @@ ELECTRON_EFL_DEPENDENCIES_LIBDIR=$(readlink -e $SCRIPTDIR/../Dependencies/Root/$
 echo "ELECTRON_EFL_LIBDIR: $ELECTRON_EFL_LIBDIR"
 echo "ELECTRON_EFL_DEPENDENCIES_LIBDIR: $ELECTRON_EFL_DEPENDENCIES_LIBDIR"
 
-export LD_LIBRARY_PATH=$ELECTRON_EFL_DEPENDENCIES_LIBDIR:$ELECTRON_EFL_LIBDIR:$CHROMIUM_EFL_PATH:${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=$ELECTRON_EFL_DEPENDENCIES_LIBDIR:$CHROMIUM_EFL_DEPENDENCIES_LIBDIR:$ELECTRON_EFL_LIBDIR:$CHROMIUM_EFL_LIBDIR:${LD_LIBRARY_PATH}
 echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
 
 # Allow chromium-efl to work with llvmpipe or softpipe mesa backends