From 4947062236f9abe280beac8ba8abea22f3d1d226 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 00:48:20 +0000
Subject: update apr and sdl archives for linux; added new archive db (needed
for linux only).
---
indra/cmake/BerkeleyDB.cmake | 3 ++-
indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
indra/cmake/LLWindow.cmake | 2 +-
indra/newview/viewer_manifest.py | 5 ++++-
4 files changed, 8 insertions(+), 4 deletions(-)
(limited to 'indra')
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake
index e3ca0fd77d..57b53f46ff 100644
--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
@@ -8,7 +8,8 @@ if (STANDALONE)
else (STANDALONE)
if (LINUX)
# Need to add dependency pthread explicitely to support ld.gold.
- set(DB_LIBRARIES db-4.2 pthread)
+ use_prebuilt_binary(db)
+ set(DB_LIBRARIES db-5.1 pthread)
else (LINUX)
set(DB_LIBRARIES db-4.2)
endif (LINUX)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 43b0347aa9..81ce7852ff 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -245,7 +245,7 @@ elseif(LINUX)
libatk-1.0.so
libbreakpad_client.so.0
libcrypto.so.0.9.7
- libdb-4.2.so
+ libdb-5.1.so
libexpat.so
libexpat.so.1
libgmock_main.so
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index a5b9cf47a4..b4bb9a078a 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -18,7 +18,7 @@ else (STANDALONE)
use_prebuilt_binary(SDL)
set (SDL_FOUND TRUE)
set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux)
- set (SDL_LIBRARY SDL)
+ set (SDL_LIBRARY SDL directfb fusion direct)
endif (LINUX AND VIEWER)
endif (STANDALONE)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9be3aa709b..68038121a0 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -934,12 +934,15 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libapr-1.so.0")
self.path("libaprutil-1.so.0")
self.path("libbreakpad_client.so.0.0.0", "libbreakpad_client.so.0")
- self.path("libdb-4.2.so")
+ self.path("libdb-5.1.so")
self.path("libcrypto.so.0.9.7")
self.path("libexpat.so.1")
self.path("libssl.so.0.9.7")
self.path("libuuid.so.1")
self.path("libSDL-1.2.so.0")
+ self.path("libdirectfb-1.4.so.5")
+ self.path("libfusion-1.4.so.5")
+ self.path("libdirect-1.4.so.5")
self.path("libELFIO.so")
self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
self.path("libalut.so")
--
cgit v1.2.3