mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
buildbot: Drop i586-mingw32msvc, add i686-w64-mingw32-posix detection
This commit is contained in:
parent
1c7b69f9cf
commit
dd228fd92e
@ -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"
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user