diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-19 20:39:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 20:39:34 +0200 |
| commit | 44dd5535f056922294867bac2eb07b57f21bede6 (patch) | |
| tree | ef603fb176951caac7201046d0204a6e489a7791 /test cases | |
| parent | 3d0b110ec2e5e0e9eddc4dcfeb925e6f62dbcba0 (diff) | |
| parent | a223b20bb60c7c643d3d4e9581101e5f54522c57 (diff) | |
| download | meson-44dd5535f056922294867bac2eb07b57f21bede6.tar.gz | |
Merge pull request #4724 from jon-turney/lib-machine-always
Fix linking when cross-compiling and a windows resource is first object
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/windows/5 resources/res/dummy.c | 0 | ||||
| -rw-r--r-- | test cases/windows/5 resources/res/meson.build | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/test cases/windows/5 resources/res/dummy.c b/test cases/windows/5 resources/res/dummy.c new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/windows/5 resources/res/dummy.c diff --git a/test cases/windows/5 resources/res/meson.build b/test cases/windows/5 resources/res/meson.build index 6d501a2e3..160d6518a 100644 --- a/test cases/windows/5 resources/res/meson.build +++ b/test cases/windows/5 resources/res/meson.build @@ -3,3 +3,7 @@ win = import('windows') res = win.compile_resources('myres.rc', depend_files: 'sample.ico', include_directories : inc) + +# test that with MSVC tools, LIB/LINK invokes CVTRES with correct /MACHINE +static_library('reslib', res, 'dummy.c') +shared_library('shreslib', res, 'dummy.c') |