From e99cfdfbc73ae4dd6dfd37fc674088aac01ec63e Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sun, 7 May 2017 22:20:54 +0100 Subject: Make vs_module_defs: do something for gcc on Windows as well Module definition files may be useful when building with gcc on Windows also (e.g. if the existing build uses them, if exports are aliased, if we were retro enough to export by ordinal, etc.) Add the .def file to the link command line when using gcc on Windows Run the appropriate windows tests irrespective of compiler. --- test cases/windows/10 vs module defs generated/meson.build | 8 +++----- test cases/windows/10 vs module defs generated/subdir/somedll.c | 2 -- test cases/windows/6 vs module defs/meson.build | 8 +++----- test cases/windows/6 vs module defs/subdir/somedll.c | 2 -- 4 files changed, 6 insertions(+), 14 deletions(-) (limited to 'test cases/windows') diff --git a/test cases/windows/10 vs module defs generated/meson.build b/test cases/windows/10 vs module defs generated/meson.build index 5ce1a2015..7728ca77a 100644 --- a/test cases/windows/10 vs module defs generated/meson.build +++ b/test cases/windows/10 vs module defs generated/meson.build @@ -1,7 +1,5 @@ project('generated_dll_module_defs', 'c') -if meson.get_compiler('c').get_id() == 'msvc' - subdir('subdir') - exe = executable('prog', 'prog.c', link_with : shlib) - test('runtest', exe) -endif +subdir('subdir') +exe = executable('prog', 'prog.c', link_with : shlib) +test('runtest', exe) diff --git a/test cases/windows/10 vs module defs generated/subdir/somedll.c b/test cases/windows/10 vs module defs generated/subdir/somedll.c index df255e38b..b23d8fed5 100644 --- a/test cases/windows/10 vs module defs generated/subdir/somedll.c +++ b/test cases/windows/10 vs module defs generated/subdir/somedll.c @@ -1,5 +1,3 @@ -#ifdef _MSC_VER int somedllfunc() { return 42; } -#endif diff --git a/test cases/windows/6 vs module defs/meson.build b/test cases/windows/6 vs module defs/meson.build index 4b9e735b9..fb59028fa 100644 --- a/test cases/windows/6 vs module defs/meson.build +++ b/test cases/windows/6 vs module defs/meson.build @@ -1,7 +1,5 @@ project('dll_module_defs', 'c') -if meson.get_compiler('c').get_id() == 'msvc' - subdir('subdir') - exe = executable('prog', 'prog.c', link_with : shlib) - test('runtest', exe) -endif +subdir('subdir') +exe = executable('prog', 'prog.c', link_with : shlib) +test('runtest', exe) diff --git a/test cases/windows/6 vs module defs/subdir/somedll.c b/test cases/windows/6 vs module defs/subdir/somedll.c index df255e38b..b23d8fed5 100644 --- a/test cases/windows/6 vs module defs/subdir/somedll.c +++ b/test cases/windows/6 vs module defs/subdir/somedll.c @@ -1,5 +1,3 @@ -#ifdef _MSC_VER int somedllfunc() { return 42; } -#endif -- cgit v1.2.3