vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri May 29 11:22:55 2020 +0200| [614f172e1c6386681aae2262767c4d1c78b39dc5] | committer: Steve Lhomme
win32: use windowsappcompat instead of winstorecompat
This is the proper counterpart to windowsapp.
Now that we have a proper Docker image to build it:
registry.videolan.org/vlc-debian-llvm-uwp:20200603145315
A recent mingw64 8 (unreleased) is needed to make use of this. It's available
in our Docker images and in msys2 (although it's using msvcrt so it will
probably fail to link properly)
The forced -lwindowsappcompat is added like the other LDFLAGS in configure.ac.
(cherry picked from commit 6e8effb678a6a65325235a7336636aed517d4333) (edited)
edited:
- this branch doesn't set winstorecompat in configure.ac but relies on the toolchain
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=614f172e1c6386681aae2262767c4d1c78b39dc5
---
extras/package/win32/build.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 16dbf25671..f45530bbd0 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -196,9 +196,9 @@ if [ ! -z "$BUILD_UCRT" ]; then
CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_UNICODE -DUNICODE"
# WinstoreCompat: hopefully can go away someday
- LDFLAGS="$LDFLAGS -lwindowsapp -lwinstorecompat"
- CFLAGS="$CFLAGS -Wl,-lwindowsapp,-lwinstorecompat"
- CXXFLAGS="$CXXFLAGS -Wl,-lwindowsapp,-lwinstorecompat"
+ LDFLAGS="$LDFLAGS -lwindowsapp -lwindowsappcompat"
+ CFLAGS="$CFLAGS -Wl,-lwindowsapp,-lwindowsappcompat"
+ CXXFLAGS="$CXXFLAGS -Wl,-lwindowsapp,-lwindowsappcompat"
CPPFLAGS="$CPPFLAGS -DWINSTORECOMPAT"
EXTRA_CRUNTIME="vcruntime140_app"
else
@@ -221,7 +221,7 @@ if [ ! -z "$BUILD_UCRT" ]; then
if [ ! -z "$WINSTORE" ]; then
# trick to provide these libraries instead of -ladvapi32 -lshell32 -luser32 -lkernel32
- sed -i -e "s/-ladvapi32/-lwindowsapp -lwinstorecompat/" $NEWSPECFILE
+ sed -i -e "s/-ladvapi32/-lwindowsapp -lwindowsappcompat/" $NEWSPECFILE
sed -i -e "s/-lshell32//" $NEWSPECFILE
sed -i -e "s/-luser32//" $NEWSPECFILE
sed -i -e "s/-lkernel32//" $NEWSPECFILE