Skip to content

Commit 087ef99

Browse files
committed
fi
1 parent 89c871d commit 087ef99

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

meson.build

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,24 +124,24 @@ else
124124
endif
125125

126126
if get_option('wasan')
127-
add_project_arguments('/DEBUG', language: 'c')
128-
add_project_arguments('/MD', language: 'c')
129-
add_project_arguments('/fsanitize=address', language: 'c')
130-
# add_project_arguments('/Zi', language: 'c') # generate .pdb iirc
131-
# add_project_arguments('/Z7', language: 'c') # generate .symbols instead of .pdb
132-
# add_project_arguments('/guard:cf', language: 'c')
127+
add_global_arguments('/DEBUG', language: 'c')
128+
add_global_arguments('/MD', language: 'c')
129+
add_global_arguments('/fsanitize=address', language: 'c')
130+
# add_global_arguments('/Zi', language: 'c') # generate .pdb iirc
131+
# add_global_arguments('/Z7', language: 'c') # generate .symbols instead of .pdb
132+
# add_global_arguments('/guard:cf', language: 'c')
133133
endif
134134

135135
if cc.get_id() == 'clang-cl'
136-
add_project_arguments('-D__STDC__=1', language: 'c')
137-
add_project_arguments('-D_CRT_DECLARE_NONSTDC_NAMES ', language: 'c')
138-
add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
139-
add_project_arguments('-D_CRT_NONSTDC_NO_DEPRECATE', language: 'c')
136+
add_global_arguments('-D__STDC__=1', language: 'c')
137+
add_global_arguments('-D_CRT_DECLARE_NONSTDC_NAMES ', language: 'c')
138+
add_global_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
139+
add_global_arguments('-D_CRT_NONSTDC_NO_DEPRECATE', language: 'c')
140140
endif
141141

142142
if get_option('default_library') == 'shared'
143143
if host_machine.system() != 'windows' or cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
144-
add_project_arguments('-fvisibility=hidden', language: 'c')
144+
add_global_arguments('-fvisibility=hidden', language: 'c')
145145
endif
146146
endif
147147

@@ -535,16 +535,14 @@ script_files = [
535535
]
536536
install_data(script_files, install_dir: r2_scripts)
537537

538-
defopts = []
539538
if cc.get_id() == 'msvc'
540539
# add_project_arguments('/Zc:preprocessor', language: 'c')
541540
if get_option('static_runtime')
542-
add_project_arguments('/MT', language: 'c')
543-
defopts = ['b_vscrt=mt']
541+
add_global_arguments('/MT', language: 'c')
544542
endif
545543
endif
546544

547-
dep_sdb = subproject('sdb', default_options: defopts)
545+
dep_sdb = subproject('sdb')
548546
sdb_dep = dep_sdb.get_variable('sdb_dep')
549547
libsdb = dep_sdb.get_variable('libsdb')
550548
libsdb_includes = dep_sdb.get_variable('sdb_inc')

0 commit comments

Comments
 (0)