[vlc-devel] [PATCH 4/4] contrib: dvdpsi: force _UNICODE for Windows Store builds

Steve Lhomme robux4 at ycbcr.xyz
Mon Mar 18 15:37:41 CET 2019


as done in the MSVC build files.

It should only affect tchar based API calls which don't seem to be used, but
since they do it.
---
 contrib/src/dvbpsi/rules.mak | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index 518949e11a..372b77ebdc 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -8,6 +8,11 @@ ifeq ($(call need_pkg,"libdvbpsi >= 1.2.0"),)
 PKGS_FOUND += dvbpsi
 endif
 
+DVBPSI_CFLAGS = $(CFLAGS)
+ifdef HAVE_WINSTORE
+DVBPSI_CFLAGS += -D_UNICODE
+endif
+
 $(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
 	$(call download,$(DVBPSI_URL))
 
@@ -23,6 +28,6 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
 	$(MOVE)
 
 .dvbpsi: libdvbpsi
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(HOSTVARS) CFLAGS="$(DVBPSI_CFLAGS)" ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
-- 
2.17.1



More information about the vlc-devel mailing list