From 906776e5bc2042446d9c3cf69434ab2d651127c9 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Fri, 12 Aug 2022 14:57:35 -0400 Subject: [PATCH] Switched to meson wrap packages --- meson.build | 4 ++-- subprojects/.gitignore | 3 +++ subprojects/imgui.wrap | 12 ++++++++++++ subprojects/zstd.wrap | 12 ++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 subprojects/.gitignore create mode 100644 subprojects/imgui.wrap create mode 100644 subprojects/zstd.wrap diff --git a/meson.build b/meson.build index a435cd39..03b952bc 100644 --- a/meson.build +++ b/meson.build @@ -101,6 +101,8 @@ if get_option('tracy_fileselector') == 'none' endif threads_dep = dependency('threads') +imgui = dependency('imgui') +zstd = dependency('zstd') includes = [ 'public/tracy/TracyC.h', @@ -199,7 +201,5 @@ tracy_dep_dynamic = declare_dependency( meson.override_dependency('tracy', tracy_dep) -subdir('zstd') -subdir('imgui') subdir('server') subdir('profiler') diff --git a/subprojects/.gitignore b/subprojects/.gitignore new file mode 100644 index 00000000..fe0b9323 --- /dev/null +++ b/subprojects/.gitignore @@ -0,0 +1,3 @@ +./* +!imgui.wrap +!zstd.wrap \ No newline at end of file diff --git a/subprojects/imgui.wrap b/subprojects/imgui.wrap new file mode 100644 index 00000000..c60d1a41 --- /dev/null +++ b/subprojects/imgui.wrap @@ -0,0 +1,12 @@ +[wrap-file] +directory = imgui-1.87 +source_url = https://github.com/ocornut/imgui/archive/refs/tags/v1.87.tar.gz +source_filename = imgui-1.87.tar.gz +source_hash = b54ceb35bda38766e36b87c25edf7a1cd8fd2cb8c485b245aedca6fb85645a20 +patch_filename = imgui_1.87-4_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/imgui_1.87-4/get_patch +patch_hash = a008fc446e8c09c5a6c985ba94d4ffe04534f8c805f2805afdd0ba17ea6c73f5 +wrapdb_version = 1.87-4 + +[provide] +imgui = imgui_dep diff --git a/subprojects/zstd.wrap b/subprojects/zstd.wrap new file mode 100644 index 00000000..b736b509 --- /dev/null +++ b/subprojects/zstd.wrap @@ -0,0 +1,12 @@ +[wrap-file] +directory = zstd-1.4.5 +source_url = https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-1.4.5.tar.gz +source_filename = zstd-1.4.5.tar.gz +source_hash = 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e +patch_url = https://wrapdb.mesonbuild.com/v2/zstd_1.4.5-1/get_patch +patch_filename = zstd-1.4.5-1-wrap.zip +patch_hash = fd9cb7b9c8f7092ef1597ff68f170beef65fcf33e575a621955cf405a41db1cc + +[provide] +libzstd = libzstd_dep +