buildsystem: don't add '-stdlib=libc++' to pkg-config, so that it doesn't interfere with the library being used in C context, but add it to internal build commands, so that everything works

Author: Totto16

meson.options

@@ -25,4 +25,3 @@ option(
     value: false,
     description: 'if you only want to build the libs, enable this',
 )
-

src/libs/core/meson.build

@@ -22,10 +22,18 @@ liboopetris_core = library(
     install: true,
 )
 
+## remove '-stdlib=libc++' from the list, if it's present
+core_dep_compile_args = []
+foreach value : core_lib.get('compile_args')
+    if value != '-stdlib=libc++'
+        core_dep_compile_args += value
+    endif
+endforeach
+
 liboopetris_core_dep = declare_dependency(
     link_with: liboopetris_core,
     include_directories: core_lib.get('inc_dirs'),
-    compile_args: core_lib.get('compile_args'),
+    compile_args: core_dep_compile_args,
     dependencies: core_lib.get('deps'),
     version: meson.project_version(),
 )

tools/dependencies/meson.build

@@ -3,9 +3,14 @@ only_allow_native_libs = false
 if meson.is_cross_build()
     if host_machine.system() == 'switch' or host_machine.system() == '3ds'
         # we do not link to code that was compiled with gcc 10.1 / gcc 7.1, the code we link with is all compiled with gcc 13.2
+
+        temp = core_lib.get('compile_args')
+        temp += '-Wno-psabi'
+
         core_lib += {
-            'compile_args': [core_lib.get('compile_args'), '-Wno-psabi'],
+            'compile_args': temp,
         }
+        temp = 0
 
         only_allow_native_libs = true
 
@@ -76,10 +81,14 @@ if not have_std_expected
     message('Compiler doesn\'t support std::expected, using fallback')
 
     tl_exp_dep = dependency('tl-expected', required: true)
+
+    temp = core_lib.get('compile_args')
+    temp += '-D_USE_TL_EXPECTED'
     core_lib += {
-        'compile_args': [core_lib.get('compile_args'), '-D_USE_TL_EXPECTED'],
+        'compile_args': temp,
         'deps': [core_lib.get('deps'), tl_exp_dep],
     }
+    temp = 0
 endif
 
 # check std::optional support
@@ -285,20 +294,20 @@ if build_application
 
         endif
 
-        core_lib += {
-            'compile_args': [
-                core_lib.get('compile_args'),
-                '-DBUILD_INSTALLER',
-            ],
-        }
+        temp = core_lib.get('compile_args')
+        temp += '-DBUILD_INSTALLER'
+        core_lib += {'compile_args': temp}
+        temp = 0
 
     endif
 
     if is_flatpak_build
         app_name = 'com.github.mgerhold.OOPetris'
-        core_lib += {
-            'compile_args': [core_lib.get('compile_args'), '-DFLATPAK_BUILD'],
-        }
+
+        temp = core_lib.get('compile_args')
+        temp += '-DFLATPAK_BUILD'
+        core_lib += {'compile_args': temp}
+        temp = 0
     endif
 
     have_file_dialogs = false

tools/options/meson.build

@@ -26,14 +26,14 @@ graphics_lib = {
 }
 
 if meson.is_cross_build() and host_machine.system() == 'serenity'
-    core_lib += {
-        'compile_args': [
-            core_lib.get('compile_args'),
-            '-D__SERENITY__',
-            '-DINSTALL_FILES',
-            '-DINSTALL_LOCATION=' + get_option('prefix'),
-        ],
-    }
+    temp = core_lib.get('compile_args')
+    temp += [
+        '-D__SERENITY__',
+        '-DINSTALL_FILES',
+        '-DINSTALL_LOCATION=' + get_option('prefix'),
+    ]
+    core_lib += {'compile_args': temp}
+    temp = 0
 endif
 
 cpp = meson.get_compiler('cpp')
@@ -68,13 +68,18 @@ elif cpp.get_id() == 'clang'
 
     if build_with_libcpp
 
+        temp = core_lib.get('compile_args')
+        temp += '-stdlib=libc++'
+
         core_lib += {
+            'compile_args': temp,
             'deps': [
                 core_lib.get('deps'),
                 cpp.find_library('c++'),
                 cpp.find_library('c++abi'),
             ],
         }
+        temp = 0
 
         if not meson.is_subproject()
             add_global_link_arguments('-stdlib=libc++', language: ['cpp'])
@@ -86,7 +91,7 @@ elif cpp.get_id() == 'clang'
         endif
 
     else
-        # TODO: once clang with libstdc++ (gcc c++ stdlib) supports std::expectedt, remove this special behaviour
+        # TODO: once clang with libstdc++ (gcc c++ stdlib) supports std::expected, remove this special behaviour
         allow_tl_expected_fallback = true
     endif