diff --git a/README.md b/README.md index 465933d6..b296679f 100644 --- a/README.md +++ b/README.md @@ -499,6 +499,7 @@ the following dependencies: The following dependencies are included in the repository as a Meson wrap: - bitsery +- function2 - tomlplusplus The project can then be compiled as follows: diff --git a/meson.build b/meson.build index bade536b..b0eae740 100644 --- a/meson.build +++ b/meson.build @@ -73,6 +73,7 @@ boost_filesystem_dep = dependency( static : with_static_boost ) bitsery_dep = subproject('bitsery').get_variable('bitsery_dep') +function2_dep = subproject('function2').get_variable('function2_dep') threads_dep = dependency('threads') tomlplusplus_dep = subproject('tomlplusplus', version : '2.1.0').get_variable('tomlplusplus_dep') # The built in threads dependency does not know how to handle winegcc @@ -141,6 +142,7 @@ executable( boost_dep, boost_filesystem_dep, bitsery_dep, + function2_dep, tomlplusplus_dep, wine_threads_dep, xcb_dep @@ -158,6 +160,7 @@ executable( boost_dep, boost_filesystem_dep, bitsery_dep, + function2_dep, tomlplusplus_dep, wine_threads_dep, xcb_dep @@ -203,6 +206,7 @@ if with_bitbridge boost_dep, boost_filesystem_dep, bitsery_dep, + function2_dep, tomlplusplus_dep, wine_threads_dep, xcb_dep @@ -227,6 +231,7 @@ if with_bitbridge boost_dep, boost_filesystem_dep, bitsery_dep, + function2_dep, tomlplusplus_dep, wine_threads_dep, xcb_dep diff --git a/subprojects/function2-patch-4.1.0.tar.xz b/subprojects/function2-patch-4.1.0.tar.xz new file mode 100644 index 00000000..141ec0d3 Binary files /dev/null and b/subprojects/function2-patch-4.1.0.tar.xz differ diff --git a/subprojects/function2.wrap b/subprojects/function2.wrap new file mode 100644 index 00000000..bb59c231 --- /dev/null +++ b/subprojects/function2.wrap @@ -0,0 +1,10 @@ +[wrap-file] +directory = function2-4.1.0 + +source_url = https://github.com/Naios/function2/archive/4.1.0.tar.gz +source_filename = function2-4.1.0.tar.gz +source_hash = c3aaeaf93bf90c0f4505a18f1094b51fe28881ce202c3bf78ec4efb336c51981 + +patch_url = file:./subprojects/function2-patch-4.1.0.tar.xz +patch_filename = function2-patch-4.1.0.tar.xz +patch_hash = 4b966afd862413ea1f3d96484e74401992ec958f1ee2b4cc161f3cb7c36fe7ba