mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

win32: Don't use dllexport/import when only building statically

Browse source 
If the prototypes in the public API have dllimport in them when building
statically on Windows, the compiler will look for symbols with symbol
mangling and indirection corresponding to a DLL. This will cause a build
failure when trying to link tests/examples/etc.

External users of GStreamer also need to define -DGST_STATIC_COMPILATION
if they want to link to static gstreamer libraries on Windows.

A similar version of this patch has been committed to all gstreamer
repositories.

https://bugzilla.gnome.org/show_bug.cgi?id=767463
This commit is contained in:
Nirbheek Chauhan 2016-06-21 19:49:15 +05:30 committed by Tim-Philipp Müller
parent 084bb505f4
commit 48088867db
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

@ -188,6 +188,12 @@ fi
AC_SUBST(GST_PLUGIN_LIBTOOLFLAGS) AC_SUBST(GST_PLUGIN_LIBTOOLFLAGS)
AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes") AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes")
dnl If only building static libraries, define GST_STATIC_COMPILATION. This is
dnl needed only on Windows, but it doesn't hurt to have it everywhere.
if test x$enable_static = xyes -a x$enable_shared = xno; then
GST_OBJ_STATIC_CFLAGS="-DGST_STATIC_COMPILATION"
fi
dnl building of tests dnl building of tests
AC_ARG_ENABLE(tests, AC_ARG_ENABLE(tests,
AS_HELP_STRING([--disable-tests],[disable building test apps]), AS_HELP_STRING([--disable-tests],[disable building test apps]),
@ -950,8 +956,8 @@ AC_SUBST(GST_LIB_LDFLAGS)
dnl GST_OBJ_* dnl GST_OBJ_*
dnl default vars for all internal objects built on libgstreamer dnl default vars for all internal objects built on libgstreamer
dnl includes GST_ALL_* dnl includes GST_ALL_*
GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS)" GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS) $GST_OBJ_STATIC_CFLAGS"
GST_OBJ_CXXFLAGS="\$(GST_ALL_CXXFLAGS)" GST_OBJ_CXXFLAGS="\$(GST_ALL_CXXFLAGS) $GST_OBJ_STATIC_CFLAGS"
GST_OBJ_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_API_VERSION.la \$(GST_ALL_LIBS)" GST_OBJ_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_API_VERSION.la \$(GST_ALL_LIBS)"
AC_SUBST(GST_OBJ_CFLAGS) AC_SUBST(GST_OBJ_CFLAGS)
AC_SUBST(GST_OBJ_CXXFLAGS) AC_SUBST(GST_OBJ_CXXFLAGS)

8
gst/gstconfig.h.in
View file

@ -133,7 +133,13 @@
* On Windows, this exports the plugin definition from the DLL. * On Windows, this exports the plugin definition from the DLL.
* On other platforms, this gets defined as a no-op. * On other platforms, this gets defined as a no-op.
*/ */
#ifdef _WIN32 /* Both 32-bit and 64-bit; both GCC and MSVC */ /* Macro _WIN32 is defined on 32-bit and 64-bit Windows; by both GCC and MSVC
*
* NOTE: To link to Windows statically on Windows, you must define
* GST_STATIC_COMPILATION or the prototypes will cause the compiler to search
* for the symbol inside a DLL
*/
#if defined(_WIN32) && !defined(GST_STATIC_COMPILATION)
# define GST_PLUGIN_EXPORT __declspec(dllexport) extern # define GST_PLUGIN_EXPORT __declspec(dllexport) extern
# ifdef GST_EXPORTS # ifdef GST_EXPORTS
# define GST_EXPORT __declspec(dllexport) extern # define GST_EXPORT __declspec(dllexport) extern