meson: try some system libs first

.github/workflows/build.yml

@@ -296,7 +296,7 @@ jobs:
       run: |
         export HOMEBREW_NO_AUTO_UPDATE=1
         export HOMEBREW_NO_INSTALL_CLEANUP=1
-        brew install \
+        brew install --arch ${{ matrix.arch }} \
           ccache \
           coreutils \
           dylibbundler \

meson.build

@@ -2302,6 +2302,7 @@ if host_os == 'windows'
       ])
 elif host_os == 'linux'
   vulkan = dependency('vulkan')
+  libglslang = dependency('glslang', required: false)
 endif
 
 if vulkan.found()
@@ -3533,11 +3534,9 @@ if have_libvduse
   libvduse = libvduse_proj.get_variable('libvduse_dep')
 endif
 
-tomlplusplus_proj = subproject('tomlplusplus', default_options: ['default_library=static'])
-tomlplusplus = tomlplusplus_proj.get_variable('tomlplusplus_dep')
+tomlplusplus = dependency('tomlplusplus', fallback: ['tomlplusplus', 'tomlplusplus_dep'], default_options: ['default_library=static'])
 
-xxhash_proj = subproject('xxhash', default_options: ['default_library=static'])
-xxhash = xxhash_proj.get_variable('xxhash_dep')
+xxhash = dependency('libxxhash', fallback: ['xxhash', 'xxhash_dep'], default_options: ['default_library=static'])
 
 #####################
 # Generated sources #

subprojects/SPIRV-Reflect.wrap

@@ -2,3 +2,4 @@
 url=https://github.com/KhronosGroup/SPIRV-Reflect
 revision=vulkan-sdk-1.3.296.0
 depth=1
+method=cmake

subprojects/VulkanMemoryAllocator.wrap

@@ -2,3 +2,4 @@
 url=https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
 revision=v3.2.0
 depth=1
+method=cmake

subprojects/glslang.wrap

@@ -2,3 +2,4 @@
 url=https://github.com/KhronosGroup/glslang
 revision=vulkan-sdk-1.3.296.0
 depth=1
+method=cmake

subprojects/nv2a_vsh_cpu.wrap

@@ -2,3 +2,4 @@
 url=https://github.com/xemu-project/nv2a_vsh_cpu
 revision=561fe80da57a881f89000256b459440c0178a7ce
 depth=1
+method=cmake

subprojects/volk.wrap

@@ -2,3 +2,4 @@
 url=https://github.com/zeux/volk
 revision=1.3.295
 depth=1
+method=cmake

ui/thirdparty/meson.build

@@ -29,14 +29,20 @@ endif
 libfpng = static_library('fpng', sources: 'fpng/fpng.cpp', cpp_args: libfpng_cpp_args)
 fpng = declare_dependency(include_directories: 'fpng', link_with: libfpng)
 
-json = declare_dependency(include_directories: 'json')
+json = dependency('nlohmann_json', required: false)
+if not json.found()
+  json = declare_dependency(include_directories: 'json')
+endif
 
-httplib_proj = subproject('cpp-httplib', default_options: ['cpp-httplib_openssl=enabled'])
-httplib_deps = [httplib_proj.get_variable('cpp_httplib_dep')]
-if host_os == 'windows'
-  httplib_deps += [crypt32]
+httplib = dependency('httplib', components: ['OpenSSL'], method: 'cmake', required: false)
+if not httplib.found()
+  httplib_proj = subproject('cpp-httplib', default_options: ['cpp-httplib_openssl=enabled'])
+  httplib_deps = [httplib_proj.get_variable('cpp_httplib_dep')]
+  if host_os == 'windows'
+    httplib_deps += [crypt32]
+  endif
+  httplib = declare_dependency(dependencies: httplib_deps)
 endif
-httplib = declare_dependency(dependencies: httplib_deps)
 
-libfatx = static_library('fatx', sources: 'fatx/fatx.c')
+libfatx = static_library('fatx', sources: files('fatx/fatx.c') + genh)
 fatx = declare_dependency(include_directories: 'fatx', link_with: libfatx)

ui/xui/reporting.cc

@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "reporting.hh"
 #include <httplib.h>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 #define DEBUG_COMPAT_SERVICE 0