diff options
| author | sfan5 <sfan5@live.de> | 2021-03-05 17:40:27 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-03-06 23:01:50 +0100 |
| commit | dd228fd92ef3a06aa8c6ce89bb304110a9587c38 (patch) | |
| tree | fa2f5b3798aa74e61413b592ccafae169963e47a | |
| parent | 1c7b69f9cf40a1395e851b1874ecad31e0e4147a (diff) | |
| download | minetest-dd228fd92ef3a06aa8c6ce89bb304110a9587c38.tar.gz minetest-dd228fd92ef3a06aa8c6ce89bb304110a9587c38.tar.bz2 minetest-dd228fd92ef3a06aa8c6ce89bb304110a9587c38.zip | |
buildbot: Drop i586-mingw32msvc, add i686-w64-mingw32-posix detection
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 6 | ||||
| -rw-r--r-- | util/buildbot/toolchain_i686-w64-mingw32-posix.cmake (renamed from util/buildbot/toolchain_i586-mingw32msvc.cmake) | 10 | ||||
| -rw-r--r-- | util/buildbot/toolchain_i686-w64-mingw32.cmake (renamed from util/buildbot/toolchain_i646-w64-mingw32.cmake) | 0 |
3 files changed, 10 insertions, 6 deletions
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index e62d32969..a296d9999 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -20,8 +20,10 @@ packagedir=$builddir/packages libdir=$builddir/libs # Test which win32 compiler is present -which i586-mingw32msvc-windres &>/dev/null && toolchain_file=$dir/toolchain_i586-mingw32msvc.cmake -which i686-w64-mingw32-windres &>/dev/null && toolchain_file=$dir/toolchain_i646-w64-mingw32.cmake +which i686-w64-mingw32-gcc &>/dev/null && + toolchain_file=$dir/toolchain_i686-w64-mingw32.cmake +which i686-w64-mingw32-gcc-posix &>/dev/null && + toolchain_file=$dir/toolchain_i686-w64-mingw32-posix.cmake if [ -z "$toolchain_file" ]; then echo "Unable to determine which mingw32 compiler to use" diff --git a/util/buildbot/toolchain_i586-mingw32msvc.cmake b/util/buildbot/toolchain_i686-w64-mingw32-posix.cmake index 0eeefb84d..b5d9ba5c4 100644 --- a/util/buildbot/toolchain_i586-mingw32msvc.cmake +++ b/util/buildbot/toolchain_i686-w64-mingw32-posix.cmake @@ -2,12 +2,14 @@ SET(CMAKE_SYSTEM_NAME Windows) # which compilers to use for C and C++ -SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc) -SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++) -SET(CMAKE_RC_COMPILER i586-mingw32msvc-windres) +# *-posix is Ubuntu's naming for the MinGW variant that comes with support +# for pthreads / std::thread (required by MT) +SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc-posix) +SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix) +SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres) # here is the target environment located -SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc) +SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32) # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search diff --git a/util/buildbot/toolchain_i646-w64-mingw32.cmake b/util/buildbot/toolchain_i686-w64-mingw32.cmake index 015baa210..015baa210 100644 --- a/util/buildbot/toolchain_i646-w64-mingw32.cmake +++ b/util/buildbot/toolchain_i686-w64-mingw32.cmake |