[vlc-commits] [Git][videolan/npapi-vlc][master] 2 commits: test WIDL with the WIDLFLAGS

[Jean-Baptiste Kempf]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC Browser Plugins


Commits:
eb385fa5 by Steve Lhomme at 2020-04-02T10:24:47+02:00
test WIDL with the WIDLFLAGS

- - - - -
1d7d0288 by Steve Lhomme at 2020-04-02T10:24:47+02:00
fix stdole2.tlb dependency

- - - - -


2 changed files:

- activex/Makefile.am
- configure.ac


Changes:

=====================================
activex/Makefile.am
=====================================
@@ -102,12 +102,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


=====================================
configure.ac
=====================================
@@ -136,7 +136,7 @@ AS_IF([test "${SYS}" = "mingw32"],[
     AS_IF([test "${WIDL}" != "no"],[
       ac_ext=idl
       ac_objext=tlb
-      ac_compile='$WIDL -t conftest.$ac_ext -o conftest.$ac_objext'
+      ac_compile='$WIDL $WIDLFLAGS -t conftest.$ac_ext -o conftest.$ac_objext'
       cat <<_ACEOF >conftest.idl
 import "ocidl.idl";
 [[



View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/-/compare/4c7155f3f155dbb6bb90788b80d3b85572cde3b4...1d7d0288fa03c22e5c01d790dbaa1ac48ddc2b45

-- 
View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/-/compare/4c7155f3f155dbb6bb90788b80d3b85572cde3b4...1d7d0288fa03c22e5c01d790dbaa1ac48ddc2b45
You're receiving this email because of your account on code.videolan.org.