Merge branch 'wip/otte/windows' into 'main'

Make vscode work

See merge request GNOME/gtk!7838
This commit is contained in:
Benjamin Otte
2024-10-19 18:20:19 +00:00
5 changed files with 20 additions and 3 deletions

2
.gitignore vendored
View File

@@ -1,2 +1,4 @@
/subprojects/*/
.flatpak-builder/
.vscode/
subprojects/*.wrap

View File

View File

@@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
@echo on
:: FIXME: make warnings fatal
pip3 install --upgrade --user meson~=0.64 || goto :error
pip3 install --upgrade --user meson~=1.2 || goto :error
meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled -Dvulkan=disabled _build || goto :error
ninja -C _build || goto :error

View File

@@ -7,7 +7,7 @@ project('gtk', 'c',
# https://github.com/mesonbuild/meson/issues/2289
'c_std=gnu99',
],
meson_version : '>= 0.63.0',
meson_version : '>= 1.2.0',
license: 'LGPL-2.1-or-later')
# keep these numbers in sync with wrap files where there exist
@@ -428,7 +428,10 @@ gi_dep = dependency('gobject-introspection-1.0', version: introspecti
required: get_option('introspection').enabled() and
get_option('build-tests'))
gstplayer_dep = dependency('gstreamer-player-1.0', version: gstreamer_req,
required: get_option('media-gstreamer'))
required: get_option('media-gstreamer'),
default_options: [
'python=disabled',
])
gstgl_dep = dependency('gstreamer-gl-1.0', version: gstreamer_req,
required: get_option('media-gstreamer'))
gstallocators_dep = dependency('gstreamer-allocators-1.0', version: gstreamer_req,
@@ -923,6 +926,10 @@ subdir('po')
subdir('docs/reference')
devenv = environment()
devenv.set('GTK_PATH', meson.current_build_dir() / 'modules')
meson.add_devenv(devenv)
if not meson.is_cross_build()
gnome.post_install(
glib_compile_schemas: true,

View File

@@ -0,0 +1,8 @@
[wrap-git]
directory=gstreamer
url=https://gitlab.freedesktop.org/gstreamer/gstreamer.git
revision=1.24
depth=1
[provide]
dependency_names = gstreamer-1.0, gstreamer-player-1.0, gstreamer-gl-1.0