[vlc-commits] package/win32: build.sh: only force win10 API's for UWP builds
Steve Lhomme
git at videolan.org
Wed Jun 10 14:14:11 CEST 2020
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jun 8 13:46:44 2020 +0200| [8f883369d45282a97a797d4d8930f51a65d7edb2] | committer: Steve Lhomme
package/win32: build.sh: only force win10 API's for UWP builds
The other UCRT builds might work in win7.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8f883369d45282a97a797d4d8930f51a65d7edb2
---
extras/package/win32/build.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 830c467fad..8b6bb1a93a 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -202,11 +202,11 @@ fi
if [ ! -z "$BUILD_UCRT" ]; then
WIDL=${TRIPLET}-widl
- CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -D__MSVCRT_VERSION__=0xE00"
+ CPPFLAGS="$CPPFLAGS -D__MSVCRT_VERSION__=0xE00"
if [ ! -z "$WINSTORE" ]; then
SHORTARCH="$SHORTARCH-uwp"
- CPPFLAGS="$CPPFLAGS -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_UNICODE -DUNICODE"
+ 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"
@@ -216,6 +216,8 @@ if [ ! -z "$BUILD_UCRT" ]; then
EXTRA_CRUNTIME="vcruntime140_app"
else
SHORTARCH="$SHORTARCH-ucrt"
+ # The current minimum for VLC is Windows 7
+ CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0601 -DWINVER=0x0601"
# this library doesn't exist yet, so use ucrt twice as a placeholder
# EXTRA_CRUNTIME="vcruntime140"
EXTRA_CRUNTIME="ucrt"
More information about the vlc-commits
mailing list