diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-06-03 19:37:58 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-06-03 19:37:58 -0400 |
| commit | 5b542e227bb952f1517c32c2de8c8af0294ec617 (patch) | |
| tree | 6159e62c6bbf5fe24b56162b47234ff0f18e3e4a /indra/cmake/LLPrimitive.cmake | |
| parent | 98ecd0443689907e3da25754868459f169cb7d85 (diff) | |
All: Committing to llqtwebkit2 and the future. Updating all libraries.
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom
to 290576, curl to 290567, fontconfig to 290569, freetype to 290557,
google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit
to 290578, openssl to 290560, PCRE to 290406, zlib to 290556. Document
compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake. It
is the README for the building process based on things learned during
this library project. Switch building process back to style used for
new llqtwebkit2 repo. This builds shared libraries for Qt4 products
on all platforms using current build machines and TC task templates.
All platforms are building. All have comparable FPS rates. Builds are
getting quieter. Forward, comrades!
Diffstat (limited to 'indra/cmake/LLPrimitive.cmake')
| -rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index d02160e439..93626f689f 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -24,7 +24,18 @@ if (WINDOWS) optimized pcre ${BOOST_SYSTEM_LIBRARIES} ) -else (WINDOWS) +elseif (DARWIN) + set(LLPRIMITIVE_LIBRARIES + llprimitive + debug collada14dom-d + optimized collada14dom + minizip + xml2 + pcrecpp + pcre + iconv # Required by libxml2 + ) +elseif (LINUX) set(LLPRIMITIVE_LIBRARIES llprimitive debug collada14dom-d |