094587aefd
This involves making libllcommon shared, a change that was not finished for windows/Mac. More changes are needed to indra/newview/viewer_manifest.py for those two operating systems, as well as to indra/copy_win_scripts. I did not test this on linux 32bit, nor non-standalone on that OS, either. I did not check voice (which will very likely not work anyway on 64bit). And currently the webkit plugin doesn't work for me, but I'll fix that in a different commit.
27 lines
657 B
CMake
27 lines
657 B
CMake
# -*- cmake -*-
|
|
include(Prebuilt)
|
|
|
|
if (NOT STANDALONE)
|
|
use_prebuilt_binary(libuuid)
|
|
use_prebuilt_binary(vivox)
|
|
if(LINUX)
|
|
if (${ARCH} STREQUAL "x86_64")
|
|
use_prebuilt_binary(32bitcompatibilitylibs)
|
|
endif (${ARCH} STREQUAL "x86_64")
|
|
use_prebuilt_binary(fontconfig)
|
|
endif(LINUX)
|
|
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)
|
|
use_prebuilt_binary(dbghelp)
|
|
endif (WINDOWS)
|
|
|