diff options
author | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-11-15 21:13:50 +0100 |
---|---|---|
committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-11-15 21:13:50 +0100 |
commit | dc913aaea58ef7ce71e27dd7e49da0b10622b05e (patch) | |
tree | c9ef9a503ff9c9732c4ea5a8df1a909c73af1880 /indra/cmake | |
parent | c721f87d83a0402a62a1694a1c682053ec0f09a7 (diff) | |
parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) |
Merge
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 |