aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/linux_tools
diff options
context:
space:
mode:
authorArmin Weatherwax2010-01-01 13:38:07 +0100
committerJacek Antonelli2010-04-29 01:15:01 -0500
commit9ce1031f50b1c4c0f0760a81856d3b1cad2454ce (patch)
tree11ae527fb5ccc1f7e9794aa280db60ad8d6756d6 /linden/indra/newview/linux_tools
parentFix filepicker not working in 64bit build. (diff)
downloadmeta-impy-9ce1031f50b1c4c0f0760a81856d3b1cad2454ce.zip
meta-impy-9ce1031f50b1c4c0f0760a81856d3b1cad2454ce.tar.gz
meta-impy-9ce1031f50b1c4c0f0760a81856d3b1cad2454ce.tar.bz2
meta-impy-9ce1031f50b1c4c0f0760a81856d3b1cad2454ce.tar.xz
Several changes to the 64bit build.
- lib folder becomes lib64, - lib32 folder prepared (for voice libs), - pango removed - gdk_pixbuf removed (Backported from f33e5d0f) @nochangelog
Diffstat (limited to 'linden/indra/newview/linux_tools')
-rwxr-xr-xlinden/indra/newview/linux_tools/wrapper.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index d6db100..30faa92 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -121,7 +121,7 @@ fi
121 121
122export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/" 122export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/"
123if [ "`uname -m`" = "x86_64" ]; then 123if [ "`uname -m`" = "x86_64" ]; then
124 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"' 124 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"'
125else 125else
126 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}"'
127fi 127fi