summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2023-05-12 07:38:26 -0400
committerDavid Robillard <d@drobilla.net>2023-05-12 07:38:26 -0400
commit5346bea51aecbb3b32996ece3c005ebb65e79cd4 (patch)
tree3a84f46a9e9c0a8f66a2d6f5a06cb2c61f3a6b23
parent11ee06fbb5f37f05bfa86d55476d5ba997b20dc8 (diff)
downloadzix-5346bea51aecbb3b32996ece3c005ebb65e79cd4.tar.gz
zix-5346bea51aecbb3b32996ece3c005ebb65e79cd4.tar.bz2
zix-5346bea51aecbb3b32996ece3c005ebb65e79cd4.zip
Fix emscripten warnings
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--benchmark/meson.build2
-rw-r--r--test/meson.build2
-rw-r--r--test/test_filesystem.c3
4 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 921792d..90fdaa5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,7 +92,7 @@ mingw64:
wasm:
image: lv2plugin/debian-wasm
script:
- - meson setup build --cross-file=/usr/share/meson/cross/wasm.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddefault_library=static -Ddocs=disabled
+ - meson setup build --cross-file=/usr/share/meson/cross/wasm.ini -Dbuildtype=debug -Dwarning_level=3 -Dwerror=true -Ddefault_library=static -Ddocs=disabled
- ninja -C build test
- meson configure -Dbuildtype=release build
- ninja -C build test
diff --git a/benchmark/meson.build b/benchmark/meson.build
index 338f4ae..d3b04ea 100644
--- a/benchmark/meson.build
+++ b/benchmark/meson.build
@@ -17,7 +17,7 @@ if glib_dep.found()
build_benchmarks = true
benchmark_c_args = platform_c_args
- if cc.get_id() == 'clang'
+ if cc.get_id() in ['clang', 'emscripten']
benchmark_c_suppressions = [
'-Wno-reserved-identifier',
]
diff --git a/test/meson.build b/test/meson.build
index 29b00ad..6691f46 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -167,7 +167,7 @@ if not get_option('tests_cpp').disabled() and add_languages(
cpp = meson.get_compiler('cpp')
cpp_test_args = []
- if cpp.get_id() == 'clang'
+ if cpp.get_id() in ['clang', 'emscripten']
cpp_test_args = [
'-Weverything',
'-Wno-c++98-compat',
diff --git a/test/test_filesystem.c b/test/test_filesystem.c
index 18a6efc..5006676 100644
--- a/test/test_filesystem.c
+++ b/test/test_filesystem.c
@@ -690,6 +690,9 @@ int
main(const int argc, char** const argv)
{
#ifdef __EMSCRIPTEN__
+ (void)argc;
+ (void)argv;
+
const char* const data_file_path = NULL;
#else
const char* const data_file_path = argc > 1 ? argv[1] : "build.ninja";