ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

meson: Optionally use system tomlplusplus, xxhash, json

This commit is contained in:
Alexandre Bouvier 2025-01-10 23:18:35 +01:00 committed by mborgerson
parent 05072e23f1
commit 7b9b7a0c25
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -3550,11 +3550,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 #

0
ui/thirdparty/json/json.hpp → ui/thirdparty/json/nlohmann/json.hpp vendored
View File

7
ui/thirdparty/meson.build vendored
View File

@ -29,7 +29,10 @@ 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
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)

2
ui/xui/reporting.cc
View File

@ -26,7 +26,7 @@
#include <glib/gi18n.h>
#include <stdio.h>
#include "reporting.hh"
#include <json.hpp>
#include <nlohmann/json.hpp>
using json = nlohmann::json;
static const char *compat_report_endpoint_url = "https://reports.xemu.app/compatibility";