mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Buildbot: Use posix on Win64 builds if available (#11355)
Use posix mingw-w64 toolchain on Win64 builds where applicable, avoids many build errors when using buildwin64.sh to build 64 bit builds on Ubuntu based Linux distributions
This commit is contained in:
parent
a8b7c8ff38
commit
cec0dfcbbd
@ -18,7 +18,18 @@ mkdir -p $builddir
|
||||
builddir="$( cd "$builddir" && pwd )"
|
||||
libdir=$builddir/libs
|
||||
|
||||
toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
|
||||
# Test which win64 compiler is present
|
||||
which x86_64-w64-mingw32-gcc &>/dev/null &&
|
||||
toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
|
||||
which x86_64-w64-mingw32-gcc-posix &>/dev/null &&
|
||||
toolchain_file=$dir/toolchain_x86_64-w64-mingw32-posix.cmake
|
||||
|
||||
if [ -z "$toolchain_file" ]; then
|
||||
echo "Unable to determine which mingw32 compiler to use"
|
||||
exit 1
|
||||
fi
|
||||
echo "Using $toolchain_file"
|
||||
|
||||
irrlicht_version=1.9.0mt1
|
||||
ogg_version=1.3.4
|
||||
vorbis_version=1.3.7
|
||||
|
19
util/buildbot/toolchain_x86_64-w64-mingw32-posix.cmake
Normal file
19
util/buildbot/toolchain_x86_64-w64-mingw32-posix.cmake
Normal file
@ -0,0 +1,19 @@
|
||||
# name of the target operating system
|
||||
SET(CMAKE_SYSTEM_NAME Windows)
|
||||
|
||||
# which compilers to use for C and C++
|
||||
# *-posix is Ubuntu's naming for the MinGW variant that comes with support
|
||||
# for pthreads / std::thread (required by MT)
|
||||
SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
|
||||
SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)
|
||||
SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
|
||||
|
||||
# here is the target environment located
|
||||
SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
|
||||
|
||||
# adjust the default behaviour of the FIND_XXX() commands:
|
||||
# search headers and libraries in the target environment, search
|
||||
# programs in the host environment
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
Loading…
Reference in New Issue
Block a user