From b2acd5508cbd56de3b0a894131e914e7ceb355ad Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 26 Feb 2020 17:57:14 +0100 Subject: [PATCH] Add bitsery as a dependency --- meson.build | 5 +++-- subprojects/.gitignore | 1 + subprojects/bitsery-patch.tar.xz | Bin 0 -> 320 bytes subprojects/bitsery.wrap | 10 ++++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 subprojects/.gitignore create mode 100644 subprojects/bitsery-patch.tar.xz create mode 100644 subprojects/bitsery.wrap diff --git a/meson.build b/meson.build index fb62de9c..afb7e544 100644 --- a/meson.build +++ b/meson.build @@ -21,6 +21,7 @@ endif # file. boost_dep = dependency('boost', modules : ['filesystem']) +bitsery_dep = subproject('bitsery').get_variable('bitsery_dep') msgpack_dep = dependency('msgpack') threads_dep = dependency('threads') # The built in threads dependency does not know how to handle winegcc @@ -36,7 +37,7 @@ shared_library( ], native : true, include_directories : include_dir, - dependencies : [boost_dep, msgpack_dep, threads_dep], + dependencies : [boost_dep, bitsery_dep, msgpack_dep, threads_dep], link_args : ['-ldl'] ) @@ -47,6 +48,6 @@ executable( ], native : false, include_directories : include_dir, - dependencies : [boost_dep, msgpack_dep, wine_threads_dep], + dependencies : [boost_dep, bitsery_dep, msgpack_dep, wine_threads_dep], link_args : [] ) diff --git a/subprojects/.gitignore b/subprojects/.gitignore new file mode 100644 index 00000000..ea053e16 --- /dev/null +++ b/subprojects/.gitignore @@ -0,0 +1 @@ +/*/* diff --git a/subprojects/bitsery-patch.tar.xz b/subprojects/bitsery-patch.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..92af9fa5ca039ec6cd508cf17bb7bdb4d56068e2 GIT binary patch literal 320 zcmV-G0l)tJH+ooF000E$*0e?f03iVu0001VFXf})C;tHdT>vo}O7I0+D~|FKu*(Bl z%2K-fGFDBoh-tUm=!vibx`^?jn4D1H@#XNILAPm3t+)@q;6};JsaeLaoo_4!0`Z5F zezGFS@&A&wQD#pF4ux@V;>1`+7fr4-7IOxXe^HaM$)tdQXeWFq)M7KaYyFa#CZ@Q* z?r~GBoR=g!GX4E7o7Q=VhdUSA6CEBhVEoyT6Tyz)3b3C_?6ui-H*pIKOJ;{6cZP0001$J)|XGzg^V;0h