aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--linden/indra/cmake/00-Common.cmake1
-rw-r--r--linden/indra/cmake/ELFIO.cmake8
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py2
3 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index fdfd587..c6b6858 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -225,6 +225,7 @@ else (STANDALONE)
225 else(${ARCH} STREQUAL "i686") 225 else(${ARCH} STREQUAL "i686")
226 if (${ARCH} STREQUAL "x86_64") 226 if (${ARCH} STREQUAL "x86_64")
227 set(${ARCH}_linux_INCLUDES 227 set(${ARCH}_linux_INCLUDES
228 ELFIO
228 atk-1.0 229 atk-1.0
229 glib-2.0 230 glib-2.0
230 gstreamer-0.10 231 gstreamer-0.10
diff --git a/linden/indra/cmake/ELFIO.cmake b/linden/indra/cmake/ELFIO.cmake
index 4f19ecd..0d376bf 100644
--- a/linden/indra/cmake/ELFIO.cmake
+++ b/linden/indra/cmake/ELFIO.cmake
@@ -6,14 +6,14 @@ set(ELFIO_FIND_QUIETLY ON)
6if (STANDALONE) 6if (STANDALONE)
7 include(FindELFIO) 7 include(FindELFIO)
8elseif (LINUX) 8elseif (LINUX)
9 if (${ARCH} STREQUAL "x86_64") 9# if (${ARCH} STREQUAL "x86_64")
10 set(ELFIO_FOUND "NO") 10# set(ELFIO_FOUND "NO")
11 else (${ARCH} STREQUAL "x86_64") 11# else (${ARCH} STREQUAL "x86_64")
12 use_prebuilt_binary(elfio) 12 use_prebuilt_binary(elfio)
13 set(ELFIO_LIBRARIES ELFIO) 13 set(ELFIO_LIBRARIES ELFIO)
14 set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) 14 set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
15 set(ELFIO_FOUND "YES") 15 set(ELFIO_FOUND "YES")
16 endif (${ARCH} STREQUAL "x86_64") 16# endif (${ARCH} STREQUAL "x86_64")
17endif (STANDALONE) 17endif (STANDALONE)
18 18
19if (ELFIO_FOUND) 19if (ELFIO_FOUND)
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index e3f1854..d9f3a08 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1012,7 +1012,7 @@ class Linux_x86_64Manifest(LinuxManifest):
1012 self.path("libssl.so.0.9.8") 1012 self.path("libssl.so.0.9.8")
1013 self.path("libuuid.so", "libuuid.so.1") 1013 self.path("libuuid.so", "libuuid.so.1")
1014 self.path("libSDL-1.2.so.0") 1014 self.path("libSDL-1.2.so.0")
1015 # self.path("libELFIO.so") 1015 self.path("libELFIO.so")
1016 self.path("libjpeg.so.7") 1016 self.path("libjpeg.so.7")
1017 self.path("libpng12.so.0") 1017 self.path("libpng12.so.0")
1018 self.path("libopenjpeg.so.2") 1018 self.path("libopenjpeg.so.2")