From fee176d253ef4db504a0235f7edb85b019a159c0 Mon Sep 17 00:00:00 2001 From: Havard Graff Date: Wed, 4 Oct 2017 14:16:46 +0200 Subject: [PATCH] meson: remove vs_module_defs The GST_EXPORT should handle it. --- gst/meson.build | 1 - libs/gst/base/meson.build | 1 - libs/gst/controller/meson.build | 1 - libs/gst/net/meson.build | 1 - meson.build | 1 - 5 files changed, 5 deletions(-) diff --git a/gst/meson.build b/gst/meson.build index e1ecea3..f449449 100644 --- a/gst/meson.build +++ b/gst/meson.build @@ -253,7 +253,6 @@ if libtype != 'static' install : true, dependencies : [gobject_dep, gmodule_dep, glib_dep, mathlib, dl_dep] + backtrace_deps + platform_deps, - vs_module_defs: vs_module_defs_dir + 'libgstreamer.def', ) libgst = libgst_shared if build_gir diff --git a/libs/gst/base/meson.build b/libs/gst/base/meson.build index 7a91272..a9fda0b 100644 --- a/libs/gst/base/meson.build +++ b/libs/gst/base/meson.build @@ -55,7 +55,6 @@ if libtype != 'static' install : true, include_directories : [configinc, libsinc], dependencies : [gobject_dep, glib_dep, gst_dep], - vs_module_defs: vs_module_defs_dir + 'libgstbase.def', ) gst_base = gst_base_shared if build_gir diff --git a/libs/gst/controller/meson.build b/libs/gst/controller/meson.build index b08ac3b..d4b2e36 100644 --- a/libs/gst/controller/meson.build +++ b/libs/gst/controller/meson.build @@ -62,7 +62,6 @@ if libtype != 'static' soversion : soversion, include_directories : [configinc, libsinc], dependencies : [gobject_dep, glib_dep, mathlib, gst_dep], - vs_module_defs: vs_module_defs_dir + 'libgstcontroller.def', ) gst_controller = gst_controller_shared if build_gir diff --git a/libs/gst/net/meson.build b/libs/gst/net/meson.build index 3cfed1f..0b861ab 100644 --- a/libs/gst/net/meson.build +++ b/libs/gst/net/meson.build @@ -41,7 +41,6 @@ if libtype != 'static' soversion : soversion, install : true, dependencies : [gio_dep, gst_base_dep], - vs_module_defs: vs_module_defs_dir + 'libgstnet.def', ) gst_net = gst_net_shared if build_gir diff --git a/meson.build b/meson.build index bfc3ae2..ef22d2b 100644 --- a/meson.build +++ b/meson.build @@ -381,7 +381,6 @@ gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \ 'g_setenv("GST_PLUGIN_SYSTEM_PATH_1_0", "", TRUE);' + \ 'gst_init(NULL,NULL);' ] -vs_module_defs_dir = meson.current_source_dir() + '/win32/common/' # Used by the *_mkenum.py helper scripts glib_mkenums = find_program('glib-mkenums') -- 2.7.4