diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-05-28 19:40:45 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-05-28 19:40:45 +0000 |
| commit | 403ec62e3ce9c32961d50ff13b38a48c24a5cc4b (patch) | |
| tree | 7b9ecb6925ec242bb97dcc5d9b162a6a0bd75939 /indra/cmake/LLPrimitive.cmake | |
| parent | 060c728970dc78d30f2cebdbeda7e56ea8de46e2 (diff) | |
All: Update library SDL to 290309, c-ares to 290089, boost to 290191,
colladadom to 290229, curl to 290186, fontconfig to 290258, freetype to 290255,
google-mock/gmock/gtest to 290199, libpng to 290081, libxml2 to 290157,
llqtwebkit to 290262/250147 (to be fixed shortly), openssl to 290083,
pcre to 290150, zlib to 290080. The freetype2 headers are now normalized
to what they would normally be on a unix-type system. Libxml2 and
pcre are available on all platforms. Libraries generally move in the
direction of static archives rather than shared libraries (e.g. openssl).
The llqtwebkit side is a step back from the more ambitious goal. What
will be used (290262) will be a simple rebuild of the existing 4.7.1
library with updated package dependencies. The bigger work will be in
the future.
Diffstat (limited to 'indra/cmake/LLPrimitive.cmake')
| -rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 0d87ff579a..71b80a1ae4 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -6,7 +6,7 @@ include(Boost) use_prebuilt_binary(colladadom) use_prebuilt_binary(pcre) -use_prebuilt_binary(libxml) +use_prebuilt_binary(libxml2) set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive @@ -15,14 +15,19 @@ if (WINDOWS) set(LLPRIMITIVE_LIBRARIES debug llprimitive optimized llprimitive - debug libcollada14dom22-d - optimized libcollada14dom22 + debug libcollada14dom23-sd + optimized libcollada14dom23-s + debug pcrecppd + optimized pcrecpp + debug pcred + optimized pcre ${BOOST_SYSTEM_LIBRARIES} ) else (WINDOWS) set(LLPRIMITIVE_LIBRARIES llprimitive - collada14dom + debug collada14dom-d + optimized collada14dom minizip xml2 pcrecpp |