pkg-config: re-enable libfmt.so, add it to the public dependencies

Totto16 · Totto16 · commit b9ca10d75dac · 2024-06-29T02:24:19.000+02:00
diff --git a/src/libs/recordings/meson.build b/src/libs/recordings/meson.build
@@ -58,7 +58,7 @@ pkg.generate(
     subdirs: 'oopetris',
     extra_cflags: recordings_dep_compile_args,
     variables: ['compiler=' + pkg_cpp_compiler, 'cpp_stdlib=' + pkg_cpp_stdlib],
-    requires: ['oopetris-core'],
+    requires: ['oopetris-core', 'fmt'],
 )
 
 # setting this to strings, so += {...} gets detected as an error, if it is done after that
diff --git a/tools/dependencies/meson.build b/tools/dependencies/meson.build
@@ -39,8 +39,6 @@ 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

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ pkg.generate(`
`58`	`58`	`subdirs: 'oopetris',`
`59`	`59`	`extra_cflags: recordings_dep_compile_args,`
`60`	`60`	`variables: ['compiler=' + pkg_cpp_compiler, 'cpp_stdlib=' + pkg_cpp_stdlib],`
`61`		`- requires: ['oopetris-core'],`
	`61`	`+ requires: ['oopetris-core', 'fmt'],`
`62`	`62`	`)`
`63`	`63`
`64`	`64`	`# setting this to strings, so += {...} gets detected as an error, if it is done after that`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ if (`
`39`	`39`	`and (host_machine.system() == 'switch' or host_machine.system() == '3ds')`
`40`	`40`	`)`
`41`	`41`	`fmt_use_header_only = true`
`42`		`-elif not build_application`
`43`		`- fmt_use_header_only = true`
`44`	`42`	`endif`
`45`	`43`
`46`	`44`	`if fmt_use_header_only`