Merge lp://staging/~widelands-dev/widelands/update_appveyor into lp://staging/widelands

Proposed by Tino
Status: Merged
Merged at revision: 8922
Proposed branch: lp://staging/~widelands-dev/widelands/update_appveyor
Merge into: lp://staging/widelands
Diff against target: 61 lines (+10/-5)
3 files modified
CMakeLists.txt (+1/-1)
appveyor.yml (+2/-2)
utils/win32/innosetup/Widelands.iss (+7/-2)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/update_appveyor
Reviewer Review Type Date Requested Status
Tino Approve
Review via email: mp+358712@code.staging.launchpad.net

Commit message

changes appveyor platform update nov'18

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

Continuous integration builds have changed state:

Travis build 4220. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/454562130.
Appveyor build 4016. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_update_appveyor-4016.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I'm wondering whether InnoSetup supports wildcards. If we could specify the .dlls as "libfluidsynth-?.dll" etc, there would be less maintenance needed for changes on AppVeyor.

Revision history for this message
Tino (tino79) wrote :

Yes, but this still would require to identify dlls in the first place. Just tested, and now we need some more dlls. (e.g. the famous libreadline7.dll ;) ).

Static linking would be the way to go.

But nearly all cmake package scripts default to the dynamic libs...

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4225. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/454944754.
Appveyor build 4021. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_update_appveyor-4021.

Revision history for this message
Tino (tino79) wrote :

Ok, i'll merge this to trunk to get win builds up again.

I'll check the issue with glbinding the next days in a different branch...

@bunnybot merge

review: Approve
Revision history for this message
kaputtnik (franku) wrote :

Thanks a lot :-)

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: