Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Seungha Yang
gst-editing-services
Commits
0cb41c78
Commit
0cb41c78
authored
Dec 31, 2018
by
Seungha Yang
🐑
Browse files
meson: Misc. fixes for MSVC build
parent
1ba59118
Pipeline
#13543
passed with stages
in 29 minutes and 49 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
meson.build
View file @
0cb41c78
...
...
@@ -42,6 +42,7 @@ if cc.get_id() == 'msvc'
'/wd4146'
,
# unary minus on unsigned (beware INT_MIN)
'/wd4244'
,
# lossy type conversion (e.g. double -> int)
'/wd4305'
,
# truncating type conversion (e.g. double -> float)
cc
.
get_supported_arguments
([
'/utf-8'
]),
# set the input encoding to utf-8
language
:
'c'
)
endif
...
...
@@ -85,11 +86,9 @@ gstvideo_dep = dependency('gstreamer-video-' + apiversion, version : gst_req,
fallback
:
[
'gst-plugins-base'
,
'video_dep'
])
gstbase_dep
=
dependency
(
'gstreamer-base-1.0'
,
version
:
gst_req
,
fallback
:
[
'gstreamer'
,
'gst_base_dep'
])
if
host_machine
.
system
()
!=
'windows'
gstcheck_dep
=
dependency
(
'gstreamer-check-1.0'
,
version
:
gst_req
,
gstcheck_dep
=
dependency
(
'gstreamer-check-1.0'
,
version
:
gst_req
,
required
:
get_option
(
'tests'
),
fallback
:
[
'gstreamer'
,
'gst_check_dep'
])
endif
gstcontroller_dep
=
dependency
(
'gstreamer-controller-1.0'
,
version
:
gst_req
,
fallback
:
[
'gstreamer'
,
'gst_controller_dep'
])
gstvalidate_dep
=
dependency
(
'gst-validate-1.0'
,
version
:
gst_req
,
required
:
false
,
...
...
@@ -129,7 +128,7 @@ gir_init_section = [ '--add-init-section=' + \
'ges_init();'
]
ges_c_args
=
[
'-DHAVE_CONFIG_H'
,
'-DG_LOG_DOMAIN="GES"'
]
plugins_install_dir
=
'@0@/gstreamer-1.0'
.
format
(
get_option
(
'libdir'
))
plugins_install_dir
=
join_paths
(
get_option
(
'libdir'
)
,
'gstreamer-1.0'
)
pkgconfig
=
import
(
'pkgconfig'
)
plugins_pkgconfig_install_dir
=
join_paths
(
plugins_install_dir
,
'pkgconfig'
)
...
...
tests/check/meson.build
View file @
0cb41c78
...
...
@@ -56,7 +56,7 @@ foreach t : ges_tests
env
.
set
(
'GST_PLUGIN_SYSTEM_PATH_1_0'
,
''
)
env
.
set
(
'GST_STATE_IGNORE_ELEMENTS'
,
''
)
env
.
set
(
'CK_DEFAULT_TIMEOUT'
,
'20'
)
env
.
set
(
'GST_REGISTRY'
,
'@0@/@1@.registry'
.
format
(
meson
.
current_build_dir
(),
test_name
))
env
.
set
(
'GST_REGISTRY'
,
join_paths
(
meson
.
current_build_dir
(),
'@0@.registry'
.
format
(
test_name
))
)
env
.
set
(
'GST_PLUGIN_PATH_1_0'
,
[
meson
.
build_root
()]
+
pluginsdirs
)
exe
=
executable
(
test_name
,
fname
,
...
...
tests/meson.build
View file @
0cb41c78
# FIXME: make check work on windows
if
host_machine
.
system
()
!=
'windows'
and
gstcheck_dep
.
found
()
if
not
get_option
(
'tests'
).
disabled
()
and
gstcheck_dep
.
found
()
subdir
(
'check'
)
endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment