[vlc-commits] [Git][videolan/npapi-vlc][master] 3 commits: configure: detect WINE_SDK_PATH in configure.ac

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC Browser Plugins


Commits:
4ea81023 by Steve Lhomme at 2024-07-26T10:07:25+02:00
configure: detect WINE_SDK_PATH in configure.ac

It may be needed for the stdole2.tld detection

- - - - -
a6331800 by Steve Lhomme at 2024-07-26T10:07:25+02:00
configure: add the Debian libwine path for stdole2.tlb

- - - - -
0b40ebe3 by Steve Lhomme at 2024-07-26T10:07:25+02:00
activex: don't define rules to build stdole2.tlb if it's found on the system

- - - - -


2 changed files:

- activex/Makefile.am
- configure.ac


Changes:

=====================================
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 $<
-
 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
+stdole2.tlb stdole2_idl.c stdole2_idl.h: $(WINE_SDK_PATH)/stdole2.idl
+	$(WIDL) $(WIDLFLAGS) -t -u -h -T stdole2.tlb -U stdole2_idl.c -H stdole2_idl.h $<
+
 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
 


=====================================
configure.ac
=====================================
@@ -136,10 +136,21 @@ 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])
             HAS_WIDL_DASH_L=yes
+
+            # path of stdole2.tlb in Debian libwine
+            AS_IF([test -d /usr/lib/${build_cpu}-${build_os}/wine/${host_cpu}-windows],[
+                WIDLFLAGS="${WIDLFLAGS} -L/usr/lib/${build_cpu}-${build_os}/wine/${host_cpu}-windows"
+            ])
         ],[
             AC_MSG_RESULT([no])
         ])



View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/-/compare/f38db2259c539708bbc15972f7ef9d651bac7f18...0b40ebe370254fe13d8e8ed3121410b57a0511b1

-- 
View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/-/compare/f38db2259c539708bbc15972f7ef9d651bac7f18...0b40ebe370254fe13d8e8ed3121410b57a0511b1
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance