diff options
author | Zachary Turner <zturner@google.com> | 2017-10-11 20:12:09 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2017-10-11 20:12:09 +0000 |
commit | fa0ca6cbd01c6289ef4073073a84200a883eb3c5 (patch) | |
tree | 2abc3114b64d579879e5787ea6a3e9cb9adbce79 /llvm/test/tools/llvm-rc/Inputs | |
parent | 210d9f43a33e98bb60231972c618482de1fdc0d6 (diff) | |
download | bcm5719-llvm-fa0ca6cbd01c6289ef4073073a84200a883eb3c5.tar.gz bcm5719-llvm-fa0ca6cbd01c6289ef4073073a84200a883eb3c5.zip |
[llvm-rc] Use proper search algorithm for finding resources.
Previously we would only look in the current directory for a
resource, which might not be the same as the directory of the
rc file. Furthermore, MSVC rc supports a /I option, and can
also look in the system environment. This patch adds support
for this search algorithm.
Differential Revision: https://reviews.llvm.org/D38740
llvm-svn: 315499
Diffstat (limited to 'llvm/test/tools/llvm-rc/Inputs')
-rw-r--r-- | llvm/test/tools/llvm-rc/Inputs/deep-include.rc | 3 | ||||
-rw-r--r-- | llvm/test/tools/llvm-rc/Inputs/include.rc | 2 | ||||
-rw-r--r-- | llvm/test/tools/llvm-rc/Inputs/nested/nested-bitmap.bmp | bin | 0 -> 110 bytes |
3 files changed, 5 insertions, 0 deletions
diff --git a/llvm/test/tools/llvm-rc/Inputs/deep-include.rc b/llvm/test/tools/llvm-rc/Inputs/deep-include.rc new file mode 100644 index 00000000000..b28fa8f243a --- /dev/null +++ b/llvm/test/tools/llvm-rc/Inputs/deep-include.rc @@ -0,0 +1,3 @@ +// Whether this is found depends on whether the /I flag searches within the +// "nested" subdirectory +foo BITMAP "nested-bitmap.bmp"
\ No newline at end of file diff --git a/llvm/test/tools/llvm-rc/Inputs/include.rc b/llvm/test/tools/llvm-rc/Inputs/include.rc new file mode 100644 index 00000000000..1cd4c28fa29 --- /dev/null +++ b/llvm/test/tools/llvm-rc/Inputs/include.rc @@ -0,0 +1,2 @@ +// Found because bitmap.bmp is in same directory +foo BITMAP "bitmap.bmp"
\ No newline at end of file diff --git a/llvm/test/tools/llvm-rc/Inputs/nested/nested-bitmap.bmp b/llvm/test/tools/llvm-rc/Inputs/nested/nested-bitmap.bmp Binary files differnew file mode 100644 index 00000000000..5d5a00d8745 --- /dev/null +++ b/llvm/test/tools/llvm-rc/Inputs/nested/nested-bitmap.bmp |