remove unnecessary deps

mesonbuild · Jan 10, 2025 · f7cdda4 · f7cdda4
1 parent 0408f11
commit f7cdda4
Showing 1 changed file with 28 additions and 69 deletions.
diff --git a/subprojects/packagefiles/quickjs-ng/meson.build b/subprojects/packagefiles/quickjs-ng/meson.build
@@ -3,91 +3,50 @@ project('quickjs-ng', 'c', version: '0.8.0', default_options: ['c_std=c11'])
 cc = meson.get_compiler('c')
 dep_m = cc.find_library('m', required: false)
 dep_threads = dependency('threads')
-deps = [dep_m, dep_threads, dependency('dl')]
+deps = [dep_m, dep_threads]
 
-add_project_arguments(
-  cc.get_supported_arguments('-Wall', '-D_CRT_SECURE_NO_WARNINGS'),
-  language: 'c',
-)
+add_project_arguments(cc.get_supported_arguments('-Wall'), language: 'c')
+
+msvc_compat = cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
 
 
-if cc.get_id() != 'msvc'
+if not msvc_compat
   add_project_arguments(
     cc.get_supported_arguments('-Wall', '-Wextra'),
     language: 'c',
   )
 endif
 
 add_project_arguments(
-  cc.get_supported_arguments('-Wno-implicit-fallthrough'),
-  language: 'c',
-)
-add_project_arguments(
-  cc.get_supported_arguments('-Wno-sign-compare'),
-  language: 'c',
-)
-add_project_arguments(
-  cc.get_supported_arguments('-Wno-missing-field-initializers'),
-  language: 'c',
-)
-add_project_arguments(
-  cc.get_supported_arguments('-Wno-unused-parameter'),
-  language: 'c',
-)
-add_project_arguments(
-  cc.get_supported_arguments('-Wno-unused-but-set-variable'),
-  language: 'c',
-)
-add_project_arguments(
-  cc.get_supported_arguments('-Wno-array-bounds'),
-  language: 'c',
-)
-add_project_arguments(
-  cc.get_supported_arguments('-Wno-format-truncation'),
-  language: 'c',
-)
-add_project_arguments(
-  cc.get_supported_arguments('-funsigned-char'),
+  cc.get_supported_arguments(
+    '-Wno-implicit-fallthrough',
+    '-Wno-sign-compare',
+    '-Wno-missing-field-initializers',
+    '-Wno-unused-parameter',
+    '-Wno-unused-but-set-variable',
+    '-Wno-array-bounds',
+    '-Wno-format-truncation',
+    '-funsigned-char',
+  ),
   language: 'c',
 )
 
-if cc.get_id() == 'msvc'
-  add_project_arguments(
-    cc.get_supported_arguments('-Wno-unsafe-buffer-usage'),
-    language: 'c',
-  )
-  add_project_arguments(
-    cc.get_supported_arguments('-Wno-sign-conversion'),
-    language: 'c',
-  )
-  add_project_arguments(
-    cc.get_supported_arguments('-Wno-nonportable-system-include-path'),
-    language: 'c',
-  )
-  add_project_arguments(
-    cc.get_supported_arguments('-Wno-implicit-int-conversion'),
-    language: 'c',
-  )
-  add_project_arguments(
-    cc.get_supported_arguments('-Wno-shorten-64-to-32'),
-    language: 'c',
-  )
-  add_project_arguments(
-    cc.get_supported_arguments('-Wno-reserved-macro-identifier'),
-    language: 'c',
-  )
-  add_project_arguments(
-    cc.get_supported_arguments('-Wno-reserved-identifier'),
-    language: 'c',
-  )
+if msvc_compat
   add_project_arguments(
-    cc.get_supported_arguments('-Wdeprecated-declarations'),
-    language: 'c',
-  )
-  add_project_arguments(
-    cc.get_supported_arguments('/experimental:c11atomics'),
+    cc.get_supported_arguments(
+      '-Wno-unsafe-buffer-usage',
+      '-Wno-sign-conversion',
+      '-Wno-nonportable-system-include-path',
+      '-Wno-implicit-int-conversion',
+      '-Wno-shorten-64-to-32',
+      '-Wno-reserved-macro-identifier',
+      '-Wno-reserved-identifier',
+      '-Wdeprecated-declarations',
+      '/experimental:c11atomics',
+    ),
     language: 'c',
   )
+
   add_project_arguments(
     cc.get_supported_arguments(
       '/wd4018',  # -Wno-sign-conversion