diff options
| author | Aleric Inglewood | 2010-10-25 02:36:53 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-25 02:36:53 +0200 |
| commit | 5900ac5f30540ac445ec50a61edfc4ed15ccbaf7 (patch) | |
| tree | 1be6e02749e779c445c3db9e4f4dd3a59043bbcf | |
| parent | IMP-664: WARNING: addFeature: LLFeatureList::Attempting to add preexisting fe... (diff) | |
| download | meta-impy-5900ac5f30540ac445ec50a61edfc4ed15ccbaf7.zip meta-impy-5900ac5f30540ac445ec50a61edfc4ed15ccbaf7.tar.gz meta-impy-5900ac5f30540ac445ec50a61edfc4ed15ccbaf7.tar.bz2 meta-impy-5900ac5f30540ac445ec50a61edfc4ed15ccbaf7.tar.xz | |
Download prebuilt vivox (and 32bitcompatibilitylibs on 64bit) even when using standalone.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/cmake/ViewerMiscLibs.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
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) | |||
| 8 | use_prebuilt_binary(32bitcompatibilitylibs) | 8 | use_prebuilt_binary(32bitcompatibilitylibs) |
| 9 | endif(LINUX AND ${ARCH} STREQUAL "x86_64") | 9 | endif(LINUX AND ${ARCH} STREQUAL "x86_64") |
| 10 | use_prebuilt_binary(fontconfig) | 10 | use_prebuilt_binary(fontconfig) |
| 11 | else (NOT STANDALONE) | ||
| 12 | # Download there even when using standalone. | ||
| 13 | set(STANDALONE OFF) | ||
| 14 | use_prebuilt_binary(vivox) | ||
| 15 | if(LINUX AND ${ARCH} STREQUAL "x86_64") | ||
| 16 | use_prebuilt_binary(32bitcompatibilitylibs) | ||
| 17 | endif(LINUX AND ${ARCH} STREQUAL "x86_64") | ||
| 18 | set(STANDALONE ON) | ||
| 11 | endif(NOT STANDALONE) | 19 | endif(NOT STANDALONE) |
| 12 | 20 | ||
| 13 | if (WINDOWS) | 21 | if (WINDOWS) |