From 542876010482bbf4a5765305b3b634bc5b13b72c Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Fri, 7 Mar 2025 21:04:20 -0700 Subject: [PATCH] meson: Drop cpp-httplib dep --- scripts/archive-source.sh | 2 +- subprojects/.gitignore | 1 - subprojects/cpp-httplib.wrap | 4 ---- ui/meson.build | 2 +- ui/thirdparty/meson.build | 7 ------- 5 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 subprojects/cpp-httplib.wrap diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 0459534567..8a2357ec60 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -36,7 +36,7 @@ sub_deinit="" # xemu only subprojects="keycodemapdb berkeley-softfloat-3 berkeley-testfloat-3 glslang SPIRV-Reflect volk VulkanMemoryAllocator nv2a_vsh_cpu - tomlplusplus cpp-httplib xxhash imgui implot genconfig" + tomlplusplus xxhash imgui implot genconfig" function cleanup() { local status=$? diff --git a/subprojects/.gitignore b/subprojects/.gitignore index 4f4958f0a9..3fbf948c03 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -24,7 +24,6 @@ volk VulkanMemoryAllocator nv2a_vsh_cpu tomlplusplus -cpp-httplib xxHash-* imgui implot diff --git a/subprojects/cpp-httplib.wrap b/subprojects/cpp-httplib.wrap deleted file mode 100644 index fc88d23ec5..0000000000 --- a/subprojects/cpp-httplib.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -url=https://github.com/yhirose/cpp-httplib -revision=0f1b62c2b3d0898cbab7aa685c2593303ffdc1a2 -depth=1 diff --git a/ui/meson.build b/ui/meson.build index 47d7540b6e..6853b37795 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -50,7 +50,7 @@ elif host_os == 'windows' elif host_os == 'darwin' xemu_ss.add(files('xemu-os-utils-macos.m')) endif -xemu_ss.add(imgui, implot, stb_image, noc, sdl, opengl, openssl, fa, fpng, json, httplib, fatx) +xemu_ss.add(imgui, implot, stb_image, noc, sdl, opengl, openssl, fa, fpng, json, fatx) system_ss.add_all(xemu_ss) system_ss.add(when: pixman, if_true: files('console-vc.c'), if_false: files('console-vc-stubs.c')) diff --git a/ui/thirdparty/meson.build b/ui/thirdparty/meson.build index 2684979282..afd6e59677 100644 --- a/ui/thirdparty/meson.build +++ b/ui/thirdparty/meson.build @@ -31,12 +31,5 @@ fpng = declare_dependency(include_directories: 'fpng', link_with: libfpng) json = declare_dependency(include_directories: 'json') -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) - libfatx = static_library('fatx', sources: 'fatx/fatx.c') fatx = declare_dependency(include_directories: 'fatx', link_with: libfatx)