mirror of https://github.com/xemu-project/xemu.git
meson: Drop cpp-httplib dep
This commit is contained in:
parent
8d2c1dbc32
commit
5428760104
|
@ -36,7 +36,7 @@ sub_deinit=""
|
||||||
# xemu only
|
# xemu only
|
||||||
subprojects="keycodemapdb berkeley-softfloat-3 berkeley-testfloat-3
|
subprojects="keycodemapdb berkeley-softfloat-3 berkeley-testfloat-3
|
||||||
glslang SPIRV-Reflect volk VulkanMemoryAllocator nv2a_vsh_cpu
|
glslang SPIRV-Reflect volk VulkanMemoryAllocator nv2a_vsh_cpu
|
||||||
tomlplusplus cpp-httplib xxhash imgui implot genconfig"
|
tomlplusplus xxhash imgui implot genconfig"
|
||||||
|
|
||||||
function cleanup() {
|
function cleanup() {
|
||||||
local status=$?
|
local status=$?
|
||||||
|
|
|
@ -24,7 +24,6 @@ volk
|
||||||
VulkanMemoryAllocator
|
VulkanMemoryAllocator
|
||||||
nv2a_vsh_cpu
|
nv2a_vsh_cpu
|
||||||
tomlplusplus
|
tomlplusplus
|
||||||
cpp-httplib
|
|
||||||
xxHash-*
|
xxHash-*
|
||||||
imgui
|
imgui
|
||||||
implot
|
implot
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
[wrap-git]
|
|
||||||
url=https://github.com/yhirose/cpp-httplib
|
|
||||||
revision=0f1b62c2b3d0898cbab7aa685c2593303ffdc1a2
|
|
||||||
depth=1
|
|
|
@ -50,7 +50,7 @@ elif host_os == 'windows'
|
||||||
elif host_os == 'darwin'
|
elif host_os == 'darwin'
|
||||||
xemu_ss.add(files('xemu-os-utils-macos.m'))
|
xemu_ss.add(files('xemu-os-utils-macos.m'))
|
||||||
endif
|
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_all(xemu_ss)
|
||||||
|
|
||||||
system_ss.add(when: pixman, if_true: files('console-vc.c'), if_false: files('console-vc-stubs.c'))
|
system_ss.add(when: pixman, if_true: files('console-vc.c'), if_false: files('console-vc-stubs.c'))
|
||||||
|
|
|
@ -31,12 +31,5 @@ fpng = declare_dependency(include_directories: 'fpng', link_with: libfpng)
|
||||||
|
|
||||||
json = declare_dependency(include_directories: 'json')
|
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')
|
libfatx = static_library('fatx', sources: 'fatx/fatx.c')
|
||||||
fatx = declare_dependency(include_directories: 'fatx', link_with: libfatx)
|
fatx = declare_dependency(include_directories: 'fatx', link_with: libfatx)
|
||||||
|
|
Loading…
Reference in New Issue