[vlc-commits] [Git][videolan/vlc][master] 2 commits: bin: don't build vlc.exe for Winstore builds

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
9d866d56 by Steve Lhomme at 2024-11-20T08:48:33+00:00
bin: don't build vlc.exe for Winstore builds

winvlc.c uses API's not available in UWP:
- SetProcessMitigationPolicy
- SetProcessDEPPolicy
- SetDllDirectory
- SetDefaultDllDirectories
- MessageBox

GetCommandLine is allowed but not in mingw-w64 yet.

- - - - -
59dfbb99 by Steve Lhomme at 2024-11-20T08:48:33+00:00
package/win32: keep building vlc.exe without the GUI

vlc.exe is usable even without the GUI.
It was originally disabled because it was tied to the UWP build.
But we can let the build system decide what is best.
In fact a CoreApplication could be done to do the same but in the UWP way.

- - - - -


3 changed files:

- bin/meson.build
- configure.ac
- extras/package/win32/build.sh


Changes:

=====================================
bin/meson.build
=====================================
@@ -1,7 +1,7 @@
 # Do we build the main VLC binary?
 build_vlc = get_option('vlc')
 
-if build_vlc and (host_system != 'darwin' or have_osx)
+if build_vlc and (host_system != 'darwin' or have_osx) and not have_win_store
     vlc_sources = []
 
     vlc_deps = [m_lib, dl_lib, threads_dep]


=====================================
configure.ac
=====================================
@@ -4796,7 +4796,7 @@ dnl  the VLC binary
 dnl
 AC_ARG_ENABLE([vlc],
   AS_HELP_STRING([--enable-vlc], [build the VLC media player (default enabled)]))
-AM_CONDITIONAL([BUILD_VLC], [test "${enable_vlc}" != "no"])
+AM_CONDITIONAL([BUILD_VLC], [test "${enable_vlc}" != "no" -a "$vlc_winstore_app" = "0"])
 
 dnl
 dnl Fuzzer (at the end not to mess dependencies FLAGS)


=====================================
extras/package/win32/build.sh
=====================================
@@ -468,8 +468,8 @@ if [ -n "$EXTRA_CHECKS" ]; then
     MCONFIGFLAGS="$MCONFIGFLAGS -Dextra_checks=true"
 fi
 if [ -n "$DISABLEGUI" ]; then
-    CONFIGFLAGS="$CONFIGFLAGS --disable-vlc --disable-qt --disable-skins2"
-    MCONFIGFLAGS="$MCONFIGFLAGS -Dvlc=false -Dqt=disabled"
+    CONFIGFLAGS="$CONFIGFLAGS --disable-qt --disable-skins2"
+    MCONFIGFLAGS="$MCONFIGFLAGS -Dqt=disabled"
     # MCONFIGFLAGS="$MCONFIGFLAGS -Dskins2=disabled"
 else
     CONFIGFLAGS="$CONFIGFLAGS --enable-qt --enable-skins2"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8ef285a45c58e90331ee947a664623c0800eb4d3...59dfbb997d04fe4998dd1acbd114aae228d81461

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8ef285a45c58e90331ee947a664623c0800eb4d3...59dfbb997d04fe4998dd1acbd114aae228d81461
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance