diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8de9924d594..f1422874904 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -316,6 +316,8 @@ jobs: export CCACHE_DIR=${GITHUB_WORKSPACE}/xemu-ccache export CCACHE_MAXSIZE=512M export PATH="/usr/local/opt/ccache/libexec:$PATH" + export PKG_CONFIG_DIR="" + export PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig" ccache -z ./build.sh ${{ matrix.build_param }} echo -e "\nCompiler Cache Stats:" diff --git a/meson.build b/meson.build index 6d6aadd0d79..3161c73aedb 100644 --- a/meson.build +++ b/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 # diff --git a/subprojects/SPIRV-Reflect.wrap b/subprojects/SPIRV-Reflect.wrap index 6893ea7ecb9..612b8c1be8a 100644 --- a/subprojects/SPIRV-Reflect.wrap +++ b/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 diff --git a/subprojects/VulkanMemoryAllocator.wrap b/subprojects/VulkanMemoryAllocator.wrap index 26f6a0c8cd0..0d3b01200b8 100644 --- a/subprojects/VulkanMemoryAllocator.wrap +++ b/subprojects/VulkanMemoryAllocator.wrap @@ -2,3 +2,4 @@ url=https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator revision=v3.2.0 depth=1 +method=cmake diff --git a/subprojects/glslang.wrap b/subprojects/glslang.wrap index 223723e721c..82940f85c46 100644 --- a/subprojects/glslang.wrap +++ b/subprojects/glslang.wrap @@ -2,3 +2,4 @@ url=https://github.com/KhronosGroup/glslang revision=vulkan-sdk-1.3.296.0 depth=1 +method=cmake diff --git a/subprojects/nv2a_vsh_cpu.wrap b/subprojects/nv2a_vsh_cpu.wrap index 816847e6730..16a00d5cceb 100644 --- a/subprojects/nv2a_vsh_cpu.wrap +++ b/subprojects/nv2a_vsh_cpu.wrap @@ -2,3 +2,4 @@ url=https://github.com/xemu-project/nv2a_vsh_cpu revision=561fe80da57a881f89000256b459440c0178a7ce depth=1 +method=cmake diff --git a/subprojects/volk.wrap b/subprojects/volk.wrap index 8089cbce56c..9477e4c5ad3 100644 --- a/subprojects/volk.wrap +++ b/subprojects/volk.wrap @@ -2,3 +2,4 @@ url=https://github.com/zeux/volk revision=1.3.295 depth=1 +method=cmake diff --git a/ui/thirdparty/json/json.hpp b/ui/thirdparty/json/nlohmann/json.hpp similarity index 100% rename from ui/thirdparty/json/json.hpp rename to ui/thirdparty/json/nlohmann/json.hpp diff --git a/ui/thirdparty/meson.build b/ui/thirdparty/meson.build index 26849792821..6ded733e0f7 100644 --- a/ui/thirdparty/meson.build +++ b/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) diff --git a/ui/xui/reporting.cc b/ui/xui/reporting.cc index c52bf00076c..e692148b2aa 100644 --- a/ui/xui/reporting.cc +++ b/ui/xui/reporting.cc @@ -23,7 +23,7 @@ #include #include "reporting.hh" #include -#include +#include using json = nlohmann::json; #define DEBUG_COMPAT_SERVICE 0