Skip to content

Commit ecbaab7

Browse files
Add /NOIMPLIB and /NOEXP when using MSVC and not clang.
Signed-off-by: David McCloskey <dave@juicelabs.co>
1 parent e641163 commit ecbaab7

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

meson.build

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cpu_family = target_machine.cpu_family()
66

77
vkd3d_compiler = meson.get_compiler('c')
88
vkd3d_is_msvc = vkd3d_compiler.get_id() == 'msvc' or vkd3d_compiler.get_id() == 'clang-cl'
9-
vkd3d_is_clang = vkd3d_compiler.get_id() == 'clang'
9+
vkd3d_is_clang = vkd3d_compiler.get_id() == 'clang' or vkd3d_compiler.get_id() == 'clang-cl'
1010
vkd3d_platform = target_machine.system()
1111

1212
vkd3d_buildtype = get_option('buildtype')
@@ -122,9 +122,11 @@ if cpu_family == 'x86'
122122

123123
# Need to link against libatomic for 64-bit atomic emulation on x86
124124
# when using clang.
125-
if vkd3d_is_clang
126-
lib_atomic = vkd3d_compiler.find_library('atomic')
127-
vkd3d_extra_libs += lib_atomic
125+
if vkd3d_platform == 'linux'
126+
if vkd3d_is_clang
127+
lib_atomic = vkd3d_compiler.find_library('atomic')
128+
vkd3d_extra_libs += lib_atomic
129+
endif
128130
endif
129131
endif
130132

@@ -146,11 +148,13 @@ if vkd3d_platform == 'windows'
146148
if vkd3d_compiler.has_link_argument('-static-libstdc++')
147149
add_global_link_arguments('-static-libstdc++', language : [ 'cpp' ])
148150
endif
149-
if vkd3d_compiler.has_link_argument('/NOIMPLIB')
150-
add_global_link_arguments('/NOIMPLIB', language : [ 'c', 'cpp' ])
151-
endif
152-
if vkd3d_compiler.has_link_argument('/NOEXP')
153-
add_global_link_arguments('/NOEXP', language : [ 'c', 'cpp' ])
151+
if not vkd3d_is_clang
152+
if vkd3d_compiler.has_link_argument('/NOIMPLIB')
153+
add_global_link_arguments('/NOIMPLIB', language : [ 'c', 'cpp' ])
154+
endif
155+
if vkd3d_compiler.has_link_argument('/NOEXP')
156+
add_global_link_arguments('/NOEXP', language : [ 'c', 'cpp' ])
157+
endif
154158
endif
155159
endif
156160

0 commit comments

Comments
 (0)