aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorArmin Weatherwax2010-01-03 22:11:52 +0100
committerJacek Antonelli2010-01-03 16:33:02 -0600
commita6255ec518859ea3a8f6951a8eb5261fa0a1bbcb (patch)
treeaed55c0a875628335435fc0d3b715bc11a3cec98 /linden/indra
parentUse ${ARCH} instead of x86_64 in CMake. (diff)
downloadmeta-impy-a6255ec518859ea3a8f6951a8eb5261fa0a1bbcb.zip
meta-impy-a6255ec518859ea3a8f6951a8eb5261fa0a1bbcb.tar.gz
meta-impy-a6255ec518859ea3a8f6951a8eb5261fa0a1bbcb.tar.bz2
meta-impy-a6255ec518859ea3a8f6951a8eb5261fa0a1bbcb.tar.xz
Tell the wrapper script where 64bit gstreamer plugins are.
(Cherry picked by Jacek from 560d3013)
Diffstat (limited to '')
-rwxr-xr-xlinden/indra/newview/linux_tools/wrapper.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 83db679..93258f4 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -117,10 +117,12 @@ if [ -n "$LL_TCMALLOC" ]; then
117 fi 117 fi
118fi 118fi
119 119
120export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/"
121if [ "`uname -m`" = "x86_64" ]; then 120if [ "`uname -m`" = "x86_64" ]; then
121 export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib64/gstreamer-plugins/"
122
122 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"' 123 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"'
123else 124else
125 export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/"
124 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' 126 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
125fi 127fi
126export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin' 128export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin'