Commit 2c9a00ba authored by Thomas BOUTROUE's avatar Thomas BOUTROUE

Add basic support for MINGW64 7.3.0

parent cf194e8d
......@@ -21,7 +21,7 @@ function initOptionsList {
if [[ "$OSFAMILY" == "GNULINUX" ]]; then
TOOLCHAINS_LIST=(gcc64 clang64)
elif [[ "$OSFAMILY" == "MSWIN" ]]; then
TOOLCHAINS_LIST=(msvc64_2010 msvc64_2013 msvc64_2015 msvc64_2017 msvc32_2015 mingw32_482 mingw32_491 mingw32_492 mingw32_530)
TOOLCHAINS_LIST=(msvc64_2010 msvc64_2013 msvc64_2015 msvc64_2017 msvc32_2015 mingw32_482 mingw32_491 mingw32_492 mingw32_530 mingw64_730)
fi
}
......@@ -130,11 +130,13 @@ function loadConfigEnvFile {
echo "MINGW32_491_PATH=" >> $CONFIG_FILE
echo "MINGW32_492_PATH=" >> $CONFIG_FILE
echo "MINGW32_530_PATH=" >> $CONFIG_FILE
echo "MINGW64_730_PATH=" >> $CONFIG_FILE
echo "" >> $CONFIG_FILE
echo "# Qt 5.x (path to qmake.exe, add as many lines as needed)" >> $CONFIG_FILE
echo "#QMAKE_5x_MSVC64_20xx_PATH" >> $CONFIG_FILE
echo "#QMAKE_5x_MSVC32_20xx_PATH" >> $CONFIG_FILE
echo "#QMAKE_5x_MINGW32_xxx_PATH" >> $CONFIG_FILE
echo "#QMAKE_5x_MINGW64_xxx_PATH" >> $CONFIG_FILE
fi
exit 1
fi
......@@ -237,6 +239,11 @@ function checkToolchain {
TOOLCHAIN_FAMILY="mingw"
TOOLCHAIN_VERSION="530"
TOOLCHAIN_PATH="$MINGW32_530_PATH"
elif [[ "$TOOLCHAIN" == "mingw64_730" ]]; then
TOOLCHAIN_ARCH="64"
TOOLCHAIN_FAMILY="mingw"
TOOLCHAIN_VERSION="730"
TOOLCHAIN_PATH="$MINGW64_730_PATH"
fi
RESULT=$(executableExists "$TOOLCHAIN_PATH")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment