From 840a30b95dd272ab38917a79b492824440331d63 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sat, 29 Jun 2024 01:47:46 +0200 Subject: [PATCH 1/2] build systsme: don't use libfmt.so in libs only build, use the header only lib, so the symbols are inside the core library --- tools/dependencies/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/dependencies/meson.build b/tools/dependencies/meson.build index 1ef446f3..d87ca33e 100644 --- a/tools/dependencies/meson.build +++ b/tools/dependencies/meson.build @@ -39,6 +39,8 @@ if ( and (host_machine.system() == 'switch' or host_machine.system() == '3ds') ) fmt_use_header_only = true +elif not build_application + fmt_use_header_only = true endif if fmt_use_header_only From 16aaf8cdebc2547044244b9cb1c6da514249dfcf Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sat, 29 Jun 2024 01:49:07 +0200 Subject: [PATCH 2/2] Wrapper: update the C wrapper --- .gitmodules | 4 ++++ wrapper/c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 167b53a5..bec4aeaa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,16 @@ [submodule "wrapper/javascript"] path = wrapper/javascript url = https://github.com/Totto16/oopetris_wrapper_js.git + ignore = dirty [submodule "wrapper/c"] path = wrapper/c url = https://github.com/Totto16/oopetris_wrapper_c.git + ignore = dirty [submodule "wrapper/haskell"] path = wrapper/haskell url = https://github.com/Totto16/oopetris_wrapper_haskell.git + ignore = dirty [submodule "wrapper/python"] path = wrapper/python url = https://github.com/Totto16/oopetris_wrapper_python.git + ignore = dirty diff --git a/wrapper/c b/wrapper/c index 7e3f7498..84991e89 160000 --- a/wrapper/c +++ b/wrapper/c @@ -1 +1 @@ -Subproject commit 7e3f7498408182a88bdc5699752783d726ab3a0e +Subproject commit 84991e89e8611155d30eafb93b92f181aa35c02a