npapi-vlc | branch: master | Steve Lhomme <[email protected]> | Thu Oct 20 10:06:32 2022 +0200| [4cd70f5f4b41b2c46add40ce04a90e75f75e2035] | committer: Steve Lhomme
configure: detect if widl uses -L for TLD includes We need to use it in some cases to include the generated stdole2.tlb. > https://code.videolan.org/videolan/npapi-vlc/commit/4cd70f5f4b41b2c46add40ce04a90e75f75e2035 --- activex/Makefile.am | 6 +++++- configure.ac | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/activex/Makefile.am b/activex/Makefile.am index 4560612..c2ddc92 100644 --- a/activex/Makefile.am +++ b/activex/Makefile.am @@ -77,7 +77,7 @@ axvlc_la_LIBADD = ../common/libvlcplugin_common.la \ DATA_axvlc_rc = $(noinst_axvlc_rc_DATA) noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT) -noinst_axvlc_rcdir = +noinst_axvlc_rcdir = axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp axvlc.tlb axvlc.dll.manifest $(WINDRES) --include-dir $(srcdir) -i $< -o $@ @@ -107,7 +107,11 @@ axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl $(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -t -u -h -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h $< else axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl stdole2.tlb +if HAS_WIDL_DASH_L $(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -L. -t -u -h -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h $< +else + $(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -t -u -h -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h $< +endif endif clean-tlb: diff --git a/configure.ac b/configure.ac index 52db4d6..3d8fac5 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,17 @@ AS_IF([test "${SYS}" = "mingw32"],[ AC_CHECK_HEADER(olectl.h,,[AC_MSG_ERROR([required OLE header olectl.h is missing from your system])]) AC_CHECK_HEADERS(objsafe.h,,,[#include <ole2.h>]) + HAS_WIDL_DASH_L=no + AS_IF([test "${WIDL}" != "no"],[ + AC_MSG_CHECKING([widl uses -L]) + AS_IF([$WIDL $WIDLFLAGS -L. -t /dev/null 2>/dev/null],[ + AC_MSG_RESULT([yes]) + HAS_WIDL_DASH_L=yes + ],[ + AC_MSG_RESULT([no]) + ]) + ]) + AC_MSG_CHECKING([for stdole2.tld presence]) AS_IF([test "${WIDL}" != "no"],[ ac_ext=idl @@ -172,6 +183,7 @@ AC_SUBST(WIDLFLAGS) AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no") AM_CONDITIONAL(HAS_WIDL_COMPILER, test "${WIDL}" != "no") AM_CONDITIONAL(HAS_STDOLE2_TLB, test "${has_stdole2_tlb}" = "yes") +AM_CONDITIONAL(HAS_WIDL_DASH_L, test "${HAS_WIDL_DASH_L}" = "yes") dnl dnl Buggy glibc prevention. Purposedly not cached. _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
