aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-08-31 15:51:18 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-09-10 21:03:41 +0300
commit654101414c873d1ccc7d1c96a3123e27aa0aa0f4 (patch)
treed9f0ad980958a36f5d13beaf7474c64fc127df62 /docs
parent39d87269b31e64cfdfb32706236ca84329dbfca4 (diff)
downloadmeson-654101414c873d1ccc7d1c96a3123e27aa0aa0f4.zip
meson-654101414c873d1ccc7d1c96a3123e27aa0aa0f4.tar.gz
meson-654101414c873d1ccc7d1c96a3123e27aa0aa0f4.tar.bz2
Improve windows resource compiler executable selection
Always honour any windres setting in cross-file (we can't be compiling with msvc, but this should apply when cross-compiling using gcc or clang) Always honour WINDRES environment variable Otherwise look for the resource compiler which is part of the same toolset as the C or C++ compiler. Add some commentary on why the conventions for compiled resource file extensions differ between RC and windres Also don't try to report non-existent path when we couldn't find the resource compiler.
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/Windows-module.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/markdown/Windows-module.md b/docs/markdown/Windows-module.md
index 39f1ba6..8c01a41 100644
--- a/docs/markdown/Windows-module.md
+++ b/docs/markdown/Windows-module.md
@@ -21,3 +21,10 @@ has the following keyword argument.
- `include_directories` lists directories to be both searched by the resource
compiler for referenced resource files, and added to the preprocessor include
search path.
+
+The resource compiler executable used is the first which exists from the
+following list:
+
+1. The `windres` executable given in the `[binaries]` section of the cross-file
+2. The `WINDRES` environment variable
+3. The resource compiler which is part of the same toolset as the C or C++ compiler in use.