[vlc-devel] [PATCH] package/win32: use VLC_DEPLOYMENT_TARGET_CFLAGS environment variable to pass CFLAGS

[Steve Lhomme]

So that Meson doesn't try to pick them.

Similar to 5c76f3478cb038a550de21f6267d57c55c963391 on macos.
---
 extras/package/win32/build.sh | 42 +++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 9607fcfe058..069ffef01f8 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -106,6 +106,43 @@ else
     COMPILING_WITH_CLANG=0
 fi
 
+# Write config.mak for contribs
+# Globals:
+#   VLC_DEPLOYMENT_TARGET_CFLAGS
+#   VLC_DEPLOYMENT_TARGET_CXXFLAGS
+#   VLC_DEPLOYMENT_TARGET_LDFLAGS
+write_config_mak()
+{
+    # Flags to be used for C-like compilers (C, C++, Obj-C)
+    local clike_flags="$VLC_DEPLOYMENT_TARGET_CFLAGS"
+
+    # local vlc_cppflags="-arch $ARCH"
+    local vlc_cflags="$clike_flags"
+    local vlc_cxxflags="$VLC_DEPLOYMENT_TARGET_CXXFLAGS $clike_flags"
+    local vlc_objcflags="$clike_flags"
+
+    local vlc_ldflags="$VLC_DEPLOYMENT_TARGET_LDFLAGS"
+
+    echo "Creating makefile..."
+    test -e config.mak && unlink config.mak
+    exec 3>config.mak || return $?
+
+    printf '# This file was automatically generated!\n\n' >&3
+    # printf '%s := %s\n' "CPPFLAGS" "${vlc_cppflags}" >&3
+    printf '%s := %s\n' "CFLAGS" "${vlc_cflags}" >&3
+    printf '%s := %s\n' "CXXFLAGS" "${vlc_cxxflags}" >&3
+    printf '%s := %s\n' "OBJCFLAGS" "${vlc_objcflags}" >&3
+    printf '%s := %s\n' "LDFLAGS" "${vlc_ldflags}" >&3
+    # printf '%s := %s\n' "CC" "clang" >&3
+    # printf '%s := %s\n' "CPP" "clang -E" >&3
+    # printf '%s := %s\n' "CXX" "clang++" >&3
+    # printf '%s := %s\n' "OBJC" "clang" >&3
+    # printf '%s := %s\n' "LD" "ld" >&3
+    # printf '%s := %s\n' "AR" "ar" >&3
+    # printf '%s := %s\n' "STRIP" "strip" >&3
+    # printf '%s := %s\n' "RANLIB" "ranlib" >&3
+}
+
 info "Building extra tools"
 mkdir -p extras/tools
 cd extras/tools
@@ -147,6 +184,11 @@ fi
 if [ "$RELEASE" != "yes" ]; then
      CONTRIBFLAGS="$CONTRIBFLAGS --disable-optim"
 fi
+
+# Write config.mak with flags for the build and compiler overrides
+# Set flag to error on partial availability
+write_config_mak "-Werror=incompatible-pointer-types"
+
 ${SCRIPT_PATH}/../../../contrib/bootstrap --host=$TRIPLET $CONTRIBFLAGS
 
 # Rebuild the contribs or use the prebuilt ones
-- 
2.17.1