duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Travis: Try to fix WINDRES and 32-bit builds

Browse source
This commit is contained in:
Clownacy 2020-01-23 16:12:33 +00:00
parent 5ac0f5d160
commit cd415916ac
1 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
.travis.yml
View file

@ -40,12 +40,13 @@ before_install:
export msys2='cmd //C RefreshEnv.cmd ' export msys2='cmd //C RefreshEnv.cmd '
export msys2+='& set MSYS=winsymlinks:nativestrict ' export msys2+='& set MSYS=winsymlinks:nativestrict '
export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start' export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
export mingw64="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --" export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
export msys2+=" -msys2 -c "\"\$@"\" --" export msys2+=" -msys2 -c "\"\$@"\" --"
$msys2 pacman --sync --noconfirm --needed make mingw-w64-x86_64-toolchain $msys2 pacman --sync --noconfirm --needed make mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain
taskkill //IM gpg-agent.exe //F # https://travis-ci.community/t/4967 taskkill //IM gpg-agent.exe //F # https://travis-ci.community/t/4967
export PATH=/C/tools/msys64/mingw64/bin:$PATH # export PATH=/C/tools/msys64/mingw64/bin:$PATH
export MAKE=mingw32-make # so that Autotools can find it # export MAKE=mingw32-make # so that Autotools can find it
;; ;;
esac esac
@ -62,11 +63,34 @@ before_install:
# Display build type # Display build type
- echo $MAKE_BUILD_TYPE - echo $MAKE_BUILD_TYPE
# Define WINDRES
- if [ "$TRAVIS_OS_NAME" = "windows" ];
then;
export WINDRES32="windres"
export WINDRES64="windres"
else;
export WINDRES32="i686-w64-mingw32-windres"
export WINDRES64="x86_64-w64-mingw32-windres"
fi
# Display compilers name/version # Display compilers name/version
- $mingw64 echo ${CC} - if [ "$TRAVIS_OS_NAME" = "windows" ];
- $mingw64 echo ${CXX} then;
- $mingw64 ${CC} --version $mingw32 echo ${CC};
- $mingw64 ${CXX} --version $mingw32 echo ${CXX};
$mingw32 ${CC} --version;
$mingw32 ${CXX} --version;
$mingw64 echo ${CC};
$mingw64 echo ${CXX};
$mingw64 ${CC} --version;
$mingw64 ${CXX} --version;
else;
echo ${CC};
echo ${CXX};
${CC} --version;
${CXX} --version;
fi
before_cache: before_cache:
- |- - |-
@ -91,10 +115,10 @@ install:
script: script:
# Compile 32-bit build # Compile 32-bit build
# - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ WINDRES=i686-w64-mingw32-windres - $mingw32 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ WINDRES=${WINDRES32}
# Compile 64-bit build # Compile 64-bit build
- $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ WINDRES=x86_64-w64-mingw32-windres - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ WINDRES=${WINDRES64}
after_success: after_success:
# Send success notification to Discord through DISCORD_WEBHOOK_URL # Send success notification to Discord through DISCORD_WEBHOOK_URL