diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-28 10:01:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-28 10:01:40 -0400 |
| commit | cd0774a2174a5f5ef4871473afd175778db60980 (patch) | |
| tree | cf664f37d824005bd768a0ce9d02a45d246bd8f0 /indra/cmake | |
| parent | 286ed4a4c2b9a0333970f4a067be751f1703b218 (diff) | |
| parent | 02e2235277a90f2e291557a429ae4e5de3e0d3b6 (diff) | |
merge changes for 3.7.19-release
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-COMPILE-LINK-RUN.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/cmake/00-COMPILE-LINK-RUN.txt b/indra/cmake/00-COMPILE-LINK-RUN.txt index d08cc2dc0c..49b899c50d 100644 --- a/indra/cmake/00-COMPILE-LINK-RUN.txt +++ b/indra/cmake/00-COMPILE-LINK-RUN.txt @@ -115,12 +115,12 @@ Compilation ---------------------------------------------------------------------------- Notes: - 1. We’re also building dylibs in a somewhat unusual way. They’re + 1. We're also building dylibs in a somewhat unusual way. They're currently being generated with a link path of - ‘@executable_path/../Resources/<library>’. If we were to follow - the recommendations in dyld’s man page, we’d instead reference - ‘@loader_path/<library>’, use -rpath on the executable link - (pointing to the ‘Resources’ subdir of the main executable), and + '@executable_path/../Resources/<library>'. If we were to follow + the recommendations in dyld's man page, we’d instead reference + '@loader_path/<library>', use -rpath on the executable link + (pointing to the 'Resources' subdir of the main executable), and be able to avoid some symlinking in the .app tree. 2. Use the -headerpad_max_install_names link option on all .dylibs. @@ -184,7 +184,7 @@ Linking second, incompatible version of the library. Switching colladadom to a static library ended the re-export problem. - * Preventing re-export is not sufficient. other libraries will + * Preventing re-export is not sufficient. Other libraries will still be shipped as shared and they can still have Singleton and Fragile Base Class issues. A DLL may be built with a static archive of a library that has global data. That same static |