vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Fri May 29 
07:12:24 2020 +0200| [c52e27a1d6584c7d607a339bcc6a4b3b0a9651cf] | committer: 
Steve Lhomme

CI: add a UWP x86_64 libvlc target

(cherry picked from commit f763d0a6b89e118891f03e55f3818ef3483e3517) (rebased)

rebased:
- this branch doesn't have a desktop/msvcrt llvm build

Signed-off-by: Steve Lhomme <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c52e27a1d6584c7d607a339bcc6a4b3b0a9651cf
---

 extras/ci/gitlab-ci.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 34a0785d2d..ec6d26e9de 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -14,6 +14,7 @@ default:
 variables:
     VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20190416165205
     VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20190416180622
+    VLC_UWP_LLVM_IMAGE: 
registry.videolan.org/vlc-debian-llvm-uwp:20200603145315
     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200229201904
     VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20190717134531
     VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-bionic:20190627090437
@@ -90,9 +91,9 @@ variables:
         fi
         if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
             echo "Building using prebuilt contribs at 
$VLC_PREBUILT_CONTRIBS_URL"
-            extras/package/win32/build.sh -p -a $HOST_ARCH 
$NIGHTLY_EXTRA_BUILD_FLAGS
+            extras/package/win32/build.sh -p -a $HOST_ARCH 
$NIGHTLY_EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
         else
-            extras/package/win32/build.sh -c -a $HOST_ARCH 
$NIGHTLY_EXTRA_BUILD_FLAGS
+            extras/package/win32/build.sh -c -a $HOST_ARCH 
$NIGHTLY_EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
         fi
 
 win32:
@@ -107,6 +108,15 @@ win64:
         name: $VLC_WIN64_IMAGE
     variables: *variables-win64
 
+uwp64-libvlc-llvm:
+    extends: .win-common
+    image:
+        name: $VLC_UWP_LLVM_IMAGE
+    variables:
+        <<: *variables-win64
+        LIBVLC_EXTRA_BUILD_FLAGS: -z
+        UWP_EXTRA_BUILD_FLAGS: -u -w -x
+
 .nightly-win-common:
     extends: .win-common
     only:

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to