summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-08-11 17:04:39 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-08-11 17:04:39 -0400
commite201c9d274539f987ca1d41fd9fb21431838fe4d (patch)
treeb02a5c4331180b764aeaa76b7fdd90d326fe6642 /indra/cmake
parent5dffe16aef7c6687a2ed47c5324f4365ff9d84df (diff)
Doc cleanup. Unicode cruft, copy editing.
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/00-COMPILE-LINK-RUN.txt12
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