From 95a188ad394084667b5b186cef467b0473645603 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 12 Mar 2010 12:09:52 +0100 Subject: Reactivated libELFIO for Linux64 (it wasn't causing the crash). (Reverts part of commit 30945b74.) --- linden/indra/cmake/00-Common.cmake | 1 + linden/indra/cmake/ELFIO.cmake | 8 ++++---- linden/indra/newview/viewer_manifest.py | 2 +- 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) else(${ARCH} STREQUAL "i686") if (${ARCH} STREQUAL "x86_64") set(${ARCH}_linux_INCLUDES + ELFIO atk-1.0 glib-2.0 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) if (STANDALONE) include(FindELFIO) elseif (LINUX) - if (${ARCH} STREQUAL "x86_64") - set(ELFIO_FOUND "NO") - else (${ARCH} STREQUAL "x86_64") +# if (${ARCH} STREQUAL "x86_64") +# set(ELFIO_FOUND "NO") +# else (${ARCH} STREQUAL "x86_64") use_prebuilt_binary(elfio) set(ELFIO_LIBRARIES ELFIO) set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) set(ELFIO_FOUND "YES") - endif (${ARCH} STREQUAL "x86_64") +# endif (${ARCH} STREQUAL "x86_64") endif (STANDALONE) if (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): self.path("libssl.so.0.9.8") self.path("libuuid.so", "libuuid.so.1") self.path("libSDL-1.2.so.0") - # self.path("libELFIO.so") + self.path("libELFIO.so") self.path("libjpeg.so.7") self.path("libpng12.so.0") self.path("libopenjpeg.so.2") -- cgit v1.1