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.
51 lines
1.5 KiB
CMake
51 lines
1.5 KiB
CMake
include(BerkeleyDB)
|
|
include(Linking)
|
|
include(Prebuilt)
|
|
|
|
set(APR_FIND_QUIETLY ON)
|
|
set(APR_FIND_REQUIRED ON)
|
|
|
|
set(APRUTIL_FIND_QUIETLY ON)
|
|
set(APRUTIL_FIND_REQUIRED ON)
|
|
|
|
if (STANDALONE)
|
|
include(FindAPR)
|
|
else (STANDALONE)
|
|
use_prebuilt_binary(apr_suite)
|
|
if (WINDOWS)
|
|
set(APR_LIBRARIES
|
|
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.lib
|
|
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.lib
|
|
)
|
|
set(APRICONV_LIBRARIES
|
|
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib
|
|
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-1.lib
|
|
)
|
|
# Doesn't need to link with iconv.dll
|
|
set(APRICONV_LIBRARIES "")
|
|
set(APRUTIL_LIBRARIES
|
|
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES}
|
|
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES}
|
|
)
|
|
elseif (DARWIN)
|
|
set(APR_LIBRARIES
|
|
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.3.7.dylib
|
|
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib
|
|
)
|
|
set(APRUTIL_LIBRARIES
|
|
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.3.8.dylib
|
|
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib
|
|
)
|
|
set(APRICONV_LIBRARIES iconv)
|
|
else (WINDOWS)
|
|
set(APR_LIBRARIES apr-1)
|
|
set(APRUTIL_LIBRARIES aprutil-1)
|
|
set(APRICONV_LIBRARIES iconv)
|
|
endif (WINDOWS)
|
|
set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
|
|
|
|
if (LINUX AND VIEWER)
|
|
list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
|
|
endif (LINUX AND VIEWER)
|
|
endif (STANDALONE)
|