diff options
| author | David Robillard <d@drobilla.net> | 2020-12-19 22:07:41 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2022-01-28 21:57:29 -0500 |
| commit | 2c5bee49b4494e172c4fa147af91bad199ed9362 (patch) | |
| tree | fa98f5b0dfad2aa5f789565f5a49b92f6484b162 | |
| parent | 046f7307653a233199ed4215a1e535b598566374 (diff) | |
| download | serd-2c5bee49b4494e172c4fa147af91bad199ed9362.tar.gz serd-2c5bee49b4494e172c4fa147af91bad199ed9362.tar.bz2 serd-2c5bee49b4494e172c4fa147af91bad199ed9362.zip | |
Add rerex subproject
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| m--------- | subprojects/rerex | 0 | ||||
| -rw-r--r-- | subprojects/rerex.wrap | 5 |
5 files changed, 15 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50c8944d..d5c5aca8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ x64_static: <<: *build_definition image: lv2plugin/debian-x64 script: - - meson setup build -Dstatic=true -Ddefault_library=static -Dexess:default_library=static -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build -Dstatic=true -Ddefault_library=static -Dexess:default_library=static -Drerex:default_library=static -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test @@ -97,7 +97,7 @@ mingw32_dbg: - ninja -C build test variables: MESON_TESTTHREADS: "1" - WINEPATH: "Z:\\usr\\lib\\gcc\\i686-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess" + WINEPATH: "Z:\\usr\\lib\\gcc\\i686-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess;Z:\\builds\\drobilla\\serd\\build\\subprojects\\rerex" mingw32_rel: <<: *build_definition @@ -107,7 +107,7 @@ mingw32_rel: - ninja -C build test variables: MESON_TESTTHREADS: "1" - WINEPATH: "Z:\\usr\\lib\\gcc\\i686-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess" + WINEPATH: "Z:\\usr\\lib\\gcc\\i686-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess;Z:\\builds\\drobilla\\serd\\build\\subprojects\\rerex" mingw64_dbg: @@ -118,7 +118,7 @@ mingw64_dbg: - ninja -C build test variables: MESON_TESTTHREADS: "1" - WINEPATH: "Z:\\usr\\lib\\gcc\\x86_64-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess" + WINEPATH: "Z:\\usr\\lib\\gcc\\x86_64-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess;Z:\\builds\\drobilla\\serd\\build\\subprojects\\rerex" mingw64_rel: <<: *build_definition @@ -128,7 +128,7 @@ mingw64_rel: - ninja -C build test variables: MESON_TESTTHREADS: "1" - WINEPATH: "Z:\\usr\\lib\\gcc\\x86_64-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess" + WINEPATH: "Z:\\usr\\lib\\gcc\\x86_64-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess;Z:\\builds\\drobilla\\serd\\build\\subprojects\\rerex" mac_dbg: diff --git a/.gitmodules b/.gitmodules index 3f314507..047718a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,10 @@ path = subprojects/exess url = ../exess.git +[submodule "subprojects/rerex"] + path = subprojects/rerex + url = ../rerex.git + [submodule "subprojects/zix"] path = subprojects/zix url = ../zix.git diff --git a/meson.build b/meson.build index f94c9dd1..326e5fbf 100644 --- a/meson.build +++ b/meson.build @@ -159,6 +159,7 @@ else library_type = 'static_library' library_args = [ '-DEXESS_STATIC', + '-DREREX_STATIC', '-DSERD_INTERNAL', '-DSERD_STATIC', '-DZIX_API=', diff --git a/subprojects/rerex b/subprojects/rerex new file mode 160000 +Subproject 784ab46e738006e384edbdd672643d73b68b145 diff --git a/subprojects/rerex.wrap b/subprojects/rerex.wrap new file mode 100644 index 00000000..b04e8eb3 --- /dev/null +++ b/subprojects/rerex.wrap @@ -0,0 +1,5 @@ +[wrap-git] +url = https://gitlab.com/drobilla/rerex.git +push-url = git@gitlab.com:drobilla/rerex.git +revision = main +depth = 1 |