summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
Diffstat (limited to 'Help')
-rw-r--r--Help/command/add_library.rst3
-rw-r--r--Help/release/dev/allow-OBJECT-library-extra-sources.rst6
2 files changed, 8 insertions, 1 deletions
diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst
index f19b5c0..f86f3c5 100644
--- a/Help/command/add_library.rst
+++ b/Help/command/add_library.rst
@@ -94,7 +94,8 @@ object library name. For example:
will include objlib's object files in a library and an executable
along with those compiled from their own sources. Object libraries
-may contain only sources (and headers) that compile to object files.
+may contain only sources that compile, header files, and other files
+that would not affect linking of a normal library (e.g. ``.txt``).
They may contain custom commands generating such sources, but not
``PRE_BUILD``, ``PRE_LINK``, or ``POST_BUILD`` commands. Object libraries
cannot be imported, exported, installed, or linked. Some native build
diff --git a/Help/release/dev/allow-OBJECT-library-extra-sources.rst b/Help/release/dev/allow-OBJECT-library-extra-sources.rst
new file mode 100644
index 0000000..472fcdc
--- /dev/null
+++ b/Help/release/dev/allow-OBJECT-library-extra-sources.rst
@@ -0,0 +1,6 @@
+allow-OBJECT-library-extra-sources
+----------------------------------
+
+* :ref:`Object Libraries` may now have extra sources that do not
+ compile to object files so long as they would not affect linking
+ of a normal library (e.g. ``.dat`` is okay but not ``.def``).