42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
diff '--color=auto' --unified --recursive --text src/vivictpp-original/meson.build src/vivictpp-0.2.1/meson.build
|
|
--- src/vivictpp-original/meson.build 2022-09-23 21:30:04.000000000 +0200
|
|
+++ src/vivictpp-0.2.1/meson.build 2022-09-25 17:28:50.765608946 +0200
|
|
@@ -7,16 +7,10 @@
|
|
#endif
|
|
|
|
|
|
-spdlog_proj = subproject('spdlog', default_options: 'warning_level=0')
|
|
-cli11_proj = subproject('cli11', default_options: 'warning_level=0')
|
|
-catch2_proj = subproject('catch2', default_options: 'warning_level=0')
|
|
-fmt_proj = subproject('fmt', default_options: 'warning_level=0')
|
|
-sdl2_proj = subproject('sdl2', default_options: ['warning_level=0', 'test=false'])
|
|
-sdl2_ttf_proj = subproject('sdl2_ttf', default_options: 'warning_level=0')
|
|
|
|
deps = [
|
|
- sdl2_proj.get_variable('sdl2_dep'),
|
|
- sdl2_ttf_proj.get_variable('sdl2_ttf_dep'),
|
|
+ dependency('sdl2'),
|
|
+ dependency('sdl2_ttf'),
|
|
dependency('freetype2', version: '>=2.8.1'),
|
|
dependency('threads'),
|
|
dependency('libavformat'),
|
|
@@ -24,13 +18,13 @@
|
|
dependency('libavutil'),
|
|
dependency('libavfilter'),
|
|
dependency('libswscale'),
|
|
- spdlog_proj.get_variable('spdlog_dep'),
|
|
- cli11_proj.get_variable('CLI11_dep'),
|
|
- fmt_proj.get_variable('fmt_dep')
|
|
+ dependency('spdlog'),
|
|
+ dependency('CLI11'),
|
|
+ dependency('fmt')
|
|
]
|
|
|
|
test_deps = [
|
|
- catch2_proj.get_variable('catch2_dep')
|
|
+ dependency('catch2')
|
|
]
|
|
|
|
incdir = include_directories('include')
|
|
Nur in src/vivictpp-0.2.1/: meson.build.orig.
|