[vlc-commits] package/win32: build.sh: Force Win7 and MSVCRT when not using UCRT

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jun  2 11:04:19 2020 +0200| [e4604363bbaf958ad168a022164578eab90b5426] | committer: Steve Lhomme

package/win32: build.sh: Force Win7 and MSVCRT when not using UCRT

That's the minimum we support in VLC 4.0.

The CRT version to set for UCRT is 0xE00.

(cherry picked from commit ab41ba662fb84c6713dd8f45383fd868c1e5697c)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e4604363bbaf958ad168a022164578eab90b5426
---

 extras/package/win32/build.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 459be16288..1c597c33bd 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -189,7 +189,7 @@ fi
 
 if [ ! -z "$BUILD_UCRT" ]; then
     WIDL=${TRIPLET}-widl
-    CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -D_UCRT"
+    CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -D__MSVCRT_VERSION__=0xE00"
 
     if [ ! -z "$WINSTORE" ]; then
         SHORTARCH="$SHORTARCH-uwp"
@@ -221,13 +221,16 @@ if [ ! -z "$BUILD_UCRT" ]; then
         CFLAGS="$CFLAGS -Wl,-lucrtbase,-lucrt"
         CXXFLAGS="$CXXFLAGS -Wl,-lucrtbase,-lucrt"
     fi
-    CFLAGS="$CPPFLAGS $CFLAGS"
-    CXXFLAGS="$CPPFLAGS $CXXFLAGS"
 
     # the values are not passed to the makefiles/configures
     export LDFLAGS
     export CPPFLAGS
+else
+    # The current minimum for VLC is Windows 7 and to use the regular msvcrt
+    CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0601 -DWINVER=0x0601 -D__MSVCRT_VERSION__=0x700"
 fi
+CFLAGS="$CPPFLAGS $CFLAGS"
+CXXFLAGS="$CPPFLAGS $CXXFLAGS"
 
 info "Building contribs"
 echo $PATH