[vlc-devel] [PATCH] package/win32: build.sh: use windowsappcompat

Steve Lhomme robux4 at ycbcr.xyz
Thu Jun 4 09:47:31 CEST 2020


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
---
 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 830c467fad9e..d2e172dbdb9c 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -209,9 +209,9 @@ if [ ! -z "$BUILD_UCRT" ]; then
         CPPFLAGS="$CPPFLAGS -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
@@ -232,7 +232,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 -lwinstoreappcompat/" $NEWSPECFILE
             sed -i -e "s/-lshell32//" $NEWSPECFILE
             sed -i -e "s/-luser32//" $NEWSPECFILE
             sed -i -e "s/-lkernel32//" $NEWSPECFILE
-- 
2.26.2



More information about the vlc-devel mailing list