chore(CI): Prefix Windows arch with win to disambiguate with other platforms

buildscripts/build_ffmpeg.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build ffmpeg for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_gdb_windows.sh

@@ -7,7 +7,7 @@
 usage()
 {
     echo "Download and build gmp for windows"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 set -euo pipefail

buildscripts/build_gmp_windows.sh

@@ -7,7 +7,7 @@
 usage()
 {
     echo "Download and build gmp for windows"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 set -euo pipefail

buildscripts/build_libexif.sh

@@ -13,7 +13,7 @@ source "$SCRIPT_DIR"/cross_compile_detection.sh
 usage()
 {
     echo "Download and build libexif for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_libexpat_windows.sh

@@ -7,7 +7,7 @@
 usage()
 {
     echo "Download and build libexpat for windows"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 set -euo pipefail

buildscripts/build_msgpack_c.sh

@@ -12,7 +12,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build msgpack-c for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_openal.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build openal for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_openssl.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build openssl for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_opus.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build opus for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_qrencode.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build qrencode for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_qrencode_cross.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-3.0-or-later AND MIT
+#     Copyright (c) 2017-2021 Maxim Biro <nurupo.contributions@gmail.com>
+#     Copyright (c) 2021 by The qTox Project Contributors
+
+set -euo pipefail
+
+SCRIPT_DIR=$(dirname $(realpath "$0"))
+
+source "${SCRIPT_DIR}/platform_detection.sh"
+
+usage()
+{
+    echo "Download and build qrencode for Windows or macOS"
+    echo "Usage: $0 --arch {winx86_64|wini686|macos}"
+}
+
+parse_arch "$@"
+
+"${SCRIPT_DIR}/download/download_qrencode.sh"
+
+cmake . \
+    -DCMAKE_BUILD_TYPE=Release \
+    "-DCMAKE_INSTALL_PREFIX=${DEP_PREFIX}" \
+    "-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOS_MINIMUM_SUPPORTED_VERSION}" \
+    "${CMAKE_TOOLCHAIN_FILE}" \
+    -DWITH_TOOLS=OFF \
+    -DBUILD_SHARED_LIBS=ON
+
+make -j "${MAKE_JOBS}"
+make install

buildscripts/build_qt.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build qt for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_sodium.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build sodium for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_sqlcipher.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build sqlcipher for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_toxcore.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build toxcore, and toxext extensions for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/build_vpx.sh

@@ -13,7 +13,7 @@ source "${SCRIPT_DIR}/cross_compile_detection.sh"
 usage()
 {
     echo "Download and build vpx for the windows cross compiling environment"
-    echo "Usage: $0 --arch {x86_64|i686}"
+    echo "Usage: $0 --arch {winx86_64|wini686}"
 }
 
 parse_arch "$@"

buildscripts/platform_detection.sh

@@ -16,9 +16,17 @@ parse_arch()
     esac
     done
 
-    if [ "$ARCH" == "i686" ] || [ "$ARCH" == "x86_64" ]; then
+    if [ "$ARCH" == "wini686" ]; then
         DEP_PREFIX='/windows/'
-        HOST_OPTION="--host=${ARCH}-w64-mingw32"
+        HOST_OPTION="--host=i686-w64-mingw32"
+        CROSS_LDFLAG=''
+        CROSS_CFLAG=''
+        CROSS_CPPFLAG=''
+        MAKE_JOBS="$(nproc)"
+        CMAKE_TOOLCHAIN_FILE="-DCMAKE_TOOLCHAIN_FILE=/build/windows-toolchain.cmake"
+    else if [ "$ARCH" == "winx86_64" ]; then
+        DEP_PREFIX='/windows/'
+        HOST_OPTION="--host=x86_64-w64-mingw32"
         CROSS_LDFLAG=''
         CROSS_CFLAG=''
         CROSS_CPPFLAG=''

windows/cross-compile/build.sh

@@ -56,8 +56,12 @@ then
   exit 1
 fi
 
-if [[ "$ARCH" != "i686" ]] && [[ "$ARCH" != "x86_64" ]]
+if [[ "$ARCH" == "i686" ]]
 then
+  ARCH=wini686
+elif [[ "$ARCH" == "x86_64" ]]
+  ARCH=winx86_64
+else
   echo "Error: Incorrect architecture was specified. Please specify either 'i686' or 'x86_64', case sensitive, as the first argument to the script."
   exit 1
 fi