vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Tue May 22 16:25:38 2018 +0200| [98bdfe4b741707ab43ce8aed02ce08964c17d8b6] | committer: Steve Lhomme
contrib: ebml: fix universal Windows build > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=98bdfe4b741707ab43ce8aed02ce08964c17d8b6 --- contrib/src/ebml/ebml-fix-univeral-windows.patch | 11 +++++++++++ contrib/src/ebml/rules.mak | 1 + 2 files changed, 12 insertions(+) diff --git a/contrib/src/ebml/ebml-fix-univeral-windows.patch b/contrib/src/ebml/ebml-fix-univeral-windows.patch new file mode 100644 index 0000000000..287e894174 --- /dev/null +++ b/contrib/src/ebml/ebml-fix-univeral-windows.patch @@ -0,0 +1,11 @@ +--- ebml/CMakeLists.txt.uwp 2018-05-22 16:23:07.388136700 +0200 ++++ ebml/CMakeLists.txt 2018-05-22 16:23:21.243621600 +0200 +@@ -60,7 +60,7 @@ set(libebml_PUBLIC_HEADERS + ebml/MemReadIOCallback.h + ebml/SafeReadIOCallback.h + ebml/StdIOCallback.h) +-if(WIN32) ++if(WIN32 AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore") + list(APPEND libebml_SOURCES + src/platform/win32/WinIOCallback.cpp) + list(APPEND libebml_PUBLIC_HEADERS diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak index 9d399fc042..47665ae1e1 100644 --- a/contrib/src/ebml/rules.mak +++ b/contrib/src/ebml/rules.mak @@ -16,6 +16,7 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml $(UNPACK) $(APPLY) $(SRC)/ebml/0001-fix-build-with-gcc-7.patch $(APPLY) $(SRC)/ebml/fix-clang-build.patch + $(APPLY) $(SRC)/ebml/ebml-fix-univeral-windows.patch $(MOVE) # libebml requires exceptions _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
