diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-17 23:20:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-17 23:20:27 -0700 |
| commit | 7f70bd69c8ac17de10a5883f4b1178a84dbbcfb5 (patch) | |
| tree | 57bc563b870d1fe1e51505c7c46c09612d217fb5 /indra | |
| parent | bce92b3ec6d3efb4a2938f35ba7e1803b4b57145 (diff) | |
| parent | 28eaade69b4b330db7a9dfea528cc4f0a3998841 (diff) | |
Pull in merov_linden/viewer-autobuild2010
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/mac_updater/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt index a4a6b50c6c..00dcedecaa 100644 --- a/indra/mac_updater/CMakeLists.txt +++ b/indra/mac_updater/CMakeLists.txt @@ -5,6 +5,7 @@ project(mac_updater) include(00-Common) include(OpenSSL) include(CURL) +include(CARes) include(LLCommon) include(LLVFS) include(Linking) @@ -12,6 +13,8 @@ include(Linking) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} + ${CURL_INCLUDE_DIRS} + ${CARES_INCLUDE_DIRS} ) set(mac_updater_SOURCE_FILES @@ -53,6 +56,7 @@ target_link_libraries(mac-updater ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARIES} ${CURL_LIBRARIES} + ${CARES_LIBRARIES} ${LLCOMMON_LIBRARIES} ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f600cb42b0..b48b0e7a3a 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -931,12 +931,18 @@ class Linux_i686Manifest(LinuxManifest): super(Linux_i686Manifest, self).construct() if self.prefix("../packages/lib/release", dst="lib"): + self.path("libapr-1.so") + self.path("libapr-1.so.0") self.path("libapr-1.so.0.4.2") + self.path("libaprutil-1.so") + self.path("libaprutil-1.so.0") self.path("libaprutil-1.so.0.3.10") self.path("libbreakpad_client.so.0.0.0") self.path("libbreakpad_client.so.0") self.path("libbreakpad_client.so") self.path("libdb-5.1.so") + self.path("libdb-5.so") + self.path("libdb.so") self.path("libcrypto.so.0.9.8") self.path("libexpat.so.1.5.2") self.path("libssl.so.0.9.8") |