[vlc-devel] [vlc-commits] win32: use windowsappcompat instead of winstorecompat

[Jean-Baptiste Kempf]

This deserves a NEWS entry.

On Wed, Jun 10, 2020, at 14:14, Steve Lhomme wrote:
> vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri May 29 
> 11:22:55 2020 +0200| [6e8effb678a6a65325235a7336636aed517d4333] | 
> 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.
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e8effb678a6a65325235a7336636aed517d4333
> ---
> 
>  configure.ac                  | 2 +-
>  contrib/src/main.mak          | 2 +-
>  extras/package/win32/build.sh | 8 ++++----
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index ace580ef66..399d0695be 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -389,7 +389,7 @@ AS_IF([test "${SYS}" = "mingw32"],[
>      AX_APPEND_FLAG([-DWINSTORECOMPAT],[CFLAGS])
>      AX_APPEND_FLAG([-DWINSTORECOMPAT],[CPPFLAGS])
>      AX_APPEND_FLAG([-DWINSTORECOMPAT],[CXXFLAGS])
> -    AX_APPEND_FLAG([-lwinstorecompat], [LDFLAGS])
> +    LDFLAGS="${LDFLAGS} -lwindowsappcompat"
>      VLC_ADD_LIBS([libvlccore], [-lruntimeobject])
>      AC_LIBOBJ([gai_strerror])
>    ],[])
> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> index eadd02a803..3119a39875 100644
> --- a/contrib/src/main.mak
> +++ b/contrib/src/main.mak
> @@ -174,7 +174,7 @@ endif
>  
>  ifdef HAVE_WINSTORE
>  EXTRA_CFLAGS += -DWINSTORECOMPAT
> -EXTRA_LDFLAGS += -lwinstorecompat
> +EXTRA_LDFLAGS += -lwindowsappcompat
>  endif
>  
>  ifneq ($(findstring clang, $(shell $(CC) --version 2>/dev/null)),)
> diff --git a/extras/package/win32/build.sh 
> b/extras/package/win32/build.sh
> index 8b6bb1a93a..4350bb178e 100755
> --- a/extras/package/win32/build.sh
> +++ b/extras/package/win32/build.sh
> @@ -209,9 +209,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
> @@ -234,7 +234,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
> 
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits
>

-- 
Jean-Baptiste Kempf -  President
+33 672 704 734