From 5900ac5f30540ac445ec50a61edfc4ed15ccbaf7 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Mon, 25 Oct 2010 02:36:53 +0200
Subject: Download prebuilt vivox (and 32bitcompatibilitylibs on 64bit) even
 when using standalone.

---
 linden/indra/cmake/ViewerMiscLibs.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 7fe1040..35f4e3a 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -8,6 +8,14 @@ if (NOT STANDALONE)
      use_prebuilt_binary(32bitcompatibilitylibs)
    endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   use_prebuilt_binary(fontconfig)
+else (NOT STANDALONE)
+  # Download there even when using standalone.
+  set(STANDALONE OFF)
+  use_prebuilt_binary(vivox)
+  if(LINUX AND ${ARCH} STREQUAL "x86_64")
+    use_prebuilt_binary(32bitcompatibilitylibs)
+  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
+  set(STANDALONE ON)
 endif(NOT STANDALONE)
 
 if (WINDOWS)
-- 
cgit v1.1