mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-23 23:15:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Travis: Use Ubuntu 18.04 (bionic) as base image

Browse Source 
It's now available and allows us to have a better default environment,
with GCC 7.4.0 and Clang 7.

We now need GCC 7+ for C++17 support so it's more efficient to upgrade
the image than to install it on Ubuntu 16.04 (xenial).

Also fixes a couple -Wdeprecated-declarations warnings on macOS now
that we build against macOS 10.12.
This commit is contained in:
Rémi Verschelde 2020-02-22 18:18:42 +01:00
parent a4801674c5
commit 6bb075a53f
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.travis.yml
View File

@ -1,7 +1,7 @@
language: cpp language: cpp
# OS config, depends on actual 'os' in build matrix # OS config, depends on actual 'os' in build matrix
dist: xenial dist: bionic
stages: stages:
- build - build
@ -26,8 +26,6 @@ matrix:
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
sources:
- llvm-toolchain-xenial-8
packages: packages:
- clang-format-8 - clang-format-8
@ -39,14 +37,15 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- mono - sourceline: "deb https://download.mono-project.com/repo/ubuntu stable-bionic main"
- ubuntu-toolchain-r-test key_url: "https://raw.githubusercontent.com/travis-ci/apt-source-safelist/master/keys/mono.asc"
- sourceline: "ppa:ubuntu-toolchain-r/test"
packages: packages:
- &gcc9_deps [gcc-9, g++-9] - &gcc9_deps [gcc-9, g++-9]
- &linux_deps [libasound2-dev, libgl1-mesa-dev, libglu1-mesa-dev, libx11-dev, libxcursor-dev, libxi-dev, libxinerama-dev, libxrandr-dev] - &linux_deps [libasound2-dev, libgl1-mesa-dev, libglu1-mesa-dev, libx11-dev, libxcursor-dev, libxi-dev, libxinerama-dev, libxrandr-dev]
- &linux_mono_deps [mono-devel, msbuild, nuget] - &linux_mono_deps [mono-devel, msbuild, nuget]
- name: Linux export template (release, Clang) - name: Linux export template (release, Clang 7)
stage: build stage: build
env: PLATFORM=x11 TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes" env: PLATFORM=x11 TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
os: linux os: linux
@ -101,14 +100,14 @@ matrix:
# addons: # addons:
# apt: # apt:
# sources: # sources:
# - ubuntu-toolchain-r-test # - sourceline: "ppa:ubuntu-toolchain-r/test"
# packages: # packages:
# - *gcc9_deps # - *gcc9_deps
# - *linux_deps # - *linux_deps
- name: Linux export template (release_debug, GCC 5, without 3D support) - name: Linux export template (release_debug, GCC 7, without 3D support)
stage: build stage: build
env: PLATFORM=x11 TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-gcc-5 EXTRA_ARGS="CXXFLAGS=-fno-strict-aliasing disable_3d=yes" env: PLATFORM=x11 TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-gcc-7 EXTRA_ARGS="disable_3d=yes"
os: linux os: linux
compiler: gcc compiler: gcc
addons: addons:
@ -124,7 +123,7 @@ before_install:
install: install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
pyenv global 3.7.1 system; pyenv global 3.7.5 system;
pip3 install --user scons; pip3 install --user scons;
fi fi
- scons --version - scons --version

4
platform/osx/os_osx.mm
View File

@ -747,7 +747,7 @@ static void _mouseDownEvent(NSEvent *event, int index, int mask, bool pressed) {
const Vector2 pos = get_mouse_pos([event locationInWindow], backingScaleFactor); const Vector2 pos = get_mouse_pos([event locationInWindow], backingScaleFactor);
mm->set_position(pos); mm->set_position(pos);
mm->set_pressure([event pressure]); mm->set_pressure([event pressure]);
if ([event subtype] == NSTabletPointEventSubtype) { if ([event subtype] == NSEventSubtypeTabletPoint) {
const NSPoint p = [event tilt]; const NSPoint p = [event tilt];
mm->set_tilt(Vector2(p.x, p.y)); mm->set_tilt(Vector2(p.x, p.y));
} }
@ -1757,7 +1757,7 @@ void OS_OSX::alert(const String &p_alert, const String &p_title) {
[window addButtonWithTitle:@"OK"]; [window addButtonWithTitle:@"OK"];
[window setMessageText:ns_title]; [window setMessageText:ns_title];
[window setInformativeText:ns_alert]; [window setInformativeText:ns_alert];
[window setAlertStyle:NSWarningAlertStyle]; [window setAlertStyle:NSAlertStyleWarning];
// Display it, then release // Display it, then release
[window runModal]; [window runModal];