npapi-vlc | branch: 3.0.x | Steve Lhomme <rob...@ycbcr.xyz> | Thu Apr 2 10:20:01 2020 +0200| [d8ea33e4a7554d12a96242738ad7e478339d6f47] | committer: Jean-Baptiste Kempf
fix stdole2.tlb dependency (cherry picked from commit 1d7d0288fa03c22e5c01d790dbaa1ac48ddc2b45) > https://code.videolan.org/videolan/npapi-vlc/commit/d8ea33e4a7554d12a96242738ad7e478339d6f47 --- activex/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/activex/Makefile.am b/activex/Makefile.am index bdd4f4c..7dd1c1e 100644 --- a/activex/Makefile.am +++ b/activex/Makefile.am @@ -107,12 +107,13 @@ 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 $< -if !HAS_STDOLE2_TLB -axvlc.tlb: stdole2.tlb -endif - +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 $< +else +axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl stdole2.tlb + $(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -t -u -h -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h $< +endif clean-tlb: rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h stdole2.tlb stdole2_idl.c stdole2_idl.h _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits