projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Back to development
[platform/upstream/gstreamer.git]
/
subprojects
/
gstreamer
/
meson.build
diff --git
a/subprojects/gstreamer/meson.build
b/subprojects/gstreamer/meson.build
index
32cb7ae
..
96f29b2
100644
(file)
--- a/
subprojects/gstreamer/meson.build
+++ b/
subprojects/gstreamer/meson.build
@@
-1,5
+1,5
@@
project('gstreamer', 'c',
project('gstreamer', 'c',
- version : '1.2
1.3
.1',
+ version : '1.2
2.2
.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
@@
-93,19
+93,11
@@
endif
# Symbol visibility
have_visibility_hidden = false
# Symbol visibility
have_visibility_hidden = false
-if cc.get_id() == 'msvc'
- export_define = '__declspec(dllexport) extern'
-elif cc.has_argument('-fvisibility=hidden')
+if cc.has_argument('-fvisibility=hidden')
add_project_arguments('-fvisibility=hidden', language: 'c')
add_project_arguments('-fvisibility=hidden', language: 'c')
- export_define = 'extern __attribute__ ((visibility ("default")))'
have_visibility_hidden = true
have_visibility_hidden = true
-else
- export_define = 'extern'
endif
endif
-# Passing this through the command line would be too messy
-cdata.set('GST_API_EXPORT', export_define)
-
# Disable strict aliasing
if cc.has_argument('-fno-strict-aliasing')
add_project_arguments('-fno-strict-aliasing', language: 'c')
# Disable strict aliasing
if cc.has_argument('-fno-strict-aliasing')
add_project_arguments('-fno-strict-aliasing', language: 'c')
@@
-362,14
+354,6
@@
endif
# All supported platforms have long long now
cdata.set('HAVE_LONG_LONG', 1)
# All supported platforms have long long now
cdata.set('HAVE_LONG_LONG', 1)
-# We only want to use the __declspec(dllexport/import) dance in GST_EXPORT when
-# building with MSVC
-if cc.get_id() == 'msvc'
- cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 1)
-else
- cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 0)
-endif
-
# -------------------------------------------------------------------------------------
# config.h things needed by libcheck
# -------------------------------------------------------------------------------------
# -------------------------------------------------------------------------------------
# config.h things needed by libcheck
# -------------------------------------------------------------------------------------