npapi-vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Fri Jul 26 10:03:01 2024 +0200| [4ea810234e4be1d85404bf7e4d5c2d66e392d8b7] | committer: Steve Lhomme
configure: detect WINE_SDK_PATH in configure.ac It may be needed for the stdole2.tld detection > https://code.videolan.org/videolan/npapi-vlc/commit/4ea810234e4be1d85404bf7e4d5c2d66e392d8b7 --- activex/Makefile.am | 10 ++++------ configure.ac | 6 ++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/activex/Makefile.am b/activex/Makefile.am index c2ddc92..20d2572 100644 --- a/activex/Makefile.am +++ b/activex/Makefile.am @@ -97,20 +97,18 @@ clean-tlb: else if HAS_WIDL_COMPILER -WINE_SDK_PATH ?= /usr/include/wine/windows - stdole2.tlb stdole2_idl.c stdole2_idl.h: $(WINE_SDK_PATH)/stdole2.idl - $(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -t -u -h -T stdole2.tlb -U stdole2_idl.c -H stdole2_idl.h $< + $(WIDL) $(WIDLFLAGS) -t -u -h -T stdole2.tlb -U stdole2_idl.c -H stdole2_idl.h $< if HAS_STDOLE2_TLB 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 $< + $(WIDL) $(WIDLFLAGS) -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 $< + $(WIDL) $(WIDLFLAGS) -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 $< + $(WIDL) $(WIDLFLAGS) -I. -t -u -h -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h $< endif endif diff --git a/configure.ac b/configure.ac index 3d8fac5..57036c8 100644 --- a/configure.ac +++ b/configure.ac @@ -136,6 +136,12 @@ AS_IF([test "${SYS}" = "mingw32"],[ HAS_WIDL_DASH_L=no AS_IF([test "${WIDL}" != "no"],[ + AS_IF([test -z ${WINE_SDK_PATH}],[ + WINE_SDK_PATH=l + ]) + AC_SUBST([WINE_SDK_PATH]) + WIDLFLAGS="${WIDLFLAGS} -I${WINE_SDK_PATH}" + AC_MSG_CHECKING([widl uses -L]) AS_IF([$WIDL $WIDLFLAGS -L. -t /dev/null 2>/dev/null],[ AC_MSG_RESULT([yes]) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
