widelands

Merge lp://qastaging/~widelands-dev/widelands/gcc9 into lp://qastaging/widelands

  1. gcc9
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 9171
Proposed branch: lp://qastaging/~widelands-dev/widelands/gcc9
Merge into: lp://qastaging/widelands
Diff against target: 72 lines (+7/-25)
3 files modified
appveyor.yml (+2/-15)
src/graphic/gl/fields_to_draw.h (+4/-9)
utils/win32/innosetup/Widelands.iss (+1/-1)
To merge this branch: bzr merge lp://qastaging/~widelands-dev/widelands/gcc9
Reviewer Review Type Date Requested Status
hessenfarmer playtest Approve
Review via email: mp+370692@code.qastaging.launchpad.net

Commit message

Patch for GCC9.

Description of the change

Tested by kaputtnik

To post a comment you must log in.
Revision history for this message
kaputtnik (franku) wrote :

Didn't we need to adapt the travis/appveyor configuration?

I am unfamiliar with those configuration, so i didn't proposed the merge...

Revision history for this message
GunChleoc (gunchleoc) wrote :

Probably - I haven't looked into that yet.

Revision history for this message
Tino (tino79) wrote :

I've pushed the appveyor changes to a github branch: https://github.com/widelands/widelands/commit/1af305097f174a9a38e2710f3f96ed26d4f39e55

Sorry, I am not able to use bzr/launchpad on my new laptop anymore.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5286. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/564607195.
Appveyor build 5061. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gcc9-5061.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks, Tino!

I have applied your changes to this branch now.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Jobs are green on AppVeyor - can somebody with a Windows machine please test before we merge?

https://ci.appveyor.com/project/widelands-dev/widelands/builds/26365811

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

ok installed the appveyor x64 release build and did some playtest worked fine so far

review: Approve (playtest)
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for testing!

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: