From 31f0601aa2fe6d4c6139917b1afd16f1343efd2f Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 18 Aug 2021 09:48:14 +0200
Subject: [PATCH] configure: add oleaut32 library to LIBCOM
This is often used in pair with OLE API's like SysAllocString or VariantInit.
This is necessary in UAP/Winstore builds as it's not part of the default libs.
---
configure.ac | 4 ++--
modules/access/Makefile.am | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9c32dbdfd154..e18ada3c490b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -390,10 +390,10 @@ AC_ARG_ENABLE([winstore_app],
vlc_winstore_app=0
AS_IF([test "${SYS}" = "mingw32"],[
- LIBCOM="-lole32"
+ LIBCOM="-lole32 -loleaut32"
AS_IF([test "${enable_winstore_app}" = "yes"], [
vlc_winstore_app=1
- LIBCOM=""
+ LIBCOM="-loleaut32"
AX_APPEND_FLAG([-DWINSTORECOMPAT],[CFLAGS])
AX_APPEND_FLAG([-DWINSTORECOMPAT],[CPPFLAGS])
AX_APPEND_FLAG([-DWINSTORECOMPAT],[CXXFLAGS])
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 6251514d907f..84558e08397e 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -156,7 +156,7 @@ endif
libdshow_plugin_la_SOURCES = access/dshow/vlc_dshow.h access/dshow/dshow.cpp access/dshow/access.h \
access/dshow/filter.cpp access/dshow/filter.h access/dshow/crossbar.cpp ../src/win32/mta_holder.h
libdshow_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSTRSAFE_NO_DEPRECATE
-libdshow_plugin_la_LIBADD = $(LIBCOM) -loleaut32 -luuid -lstrmiids -lksuser
+libdshow_plugin_la_LIBADD = $(LIBCOM) -luuid -lstrmiids -lksuser
if HAVE_WIN32_DESKTOP
access_LTLIBRARIES += libdshow_plugin.la
endif
@@ -292,7 +292,7 @@ if HAVE_WIN32_DESKTOP
# Use an import library for C++ to retain C linker on other platforms.
libbda_la_SOURCES = access/dtv/bdadefs.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
libbda_la_LDFLAGS = -static
-libbda_la_LIBADD = -lstrmiids $(LIBCOM) -loleaut32 -luuid
+libbda_la_LIBADD = -lstrmiids $(LIBCOM) -luuid
noinst_LTLIBRARIES += libbda.la
libdtv_plugin_la_DEPENDENCIES = libbda.la
--
GitLab