Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch macOS and Linux default toolchain to .NET 5. #19026

Merged
merged 2 commits into from
Jan 16, 2021

Conversation

pchote
Copy link
Member

@pchote pchote commented Jan 9, 2021

This PR should cover all the remaining details to switch our default toolchain to .NET 5, keeping compatibility with mono for those who want it on macOS and Linux.

@pchote
Copy link
Member Author

pchote commented Jan 9, 2021

The updated install document can be viewed in a readable form at https://github.com/pchote/OpenRA/blob/net5-makefile/INSTALL.md

abcdefg30
abcdefg30 previously approved these changes Jan 10, 2021
Makefile Outdated Show resolved Hide resolved
utility.sh Outdated Show resolved Hide resolved
launch-dedicated.sh Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@pchote
Copy link
Member Author

pchote commented Jan 11, 2021

We should also merge #19006 first to avoid unnecessary rebase pain wrt the prep branch.

@pchote
Copy link
Member Author

pchote commented Jan 16, 2021

Updated to include the configure-system-libraries.sh fix from #19057.

The build refuses to run with Illegal instruction: 4 after compiling using TARGETPLATFORM=unix-generic, so this will require further investigation.

@teinarss
Copy link
Contributor

Updated to include the configure-system-libraries.sh fix from #19057.

The build refuses to run with Illegal instruction: 4 after compiling using TARGETPLATFORM=unix-generic, so this will require further investigation.

On mono or dotnet, both?

@pchote pchote force-pushed the net5-makefile branch 3 times, most recently from e876166 to 19ddc55 Compare January 16, 2021 16:58
@pchote
Copy link
Member Author

pchote commented Jan 16, 2021

Only on dotnet, only for libsdl2.dylib, and only on macOS. It works fine on Linux (provided the system has a recent enough version of SDL2 installed), and works fine on macOS for the other dylibs. When I tried compiling my own version of SDL2 locally, the game freezes during startup under both mono and dotnet.

This was working fine when I first opened the PR, so I don't understand what has broken...

Since unix-generic is still working as expected under linux, and macOS users don't generally expect this kind of feature to be available, my solution is to remove mention of unix-generic under the macOS build docs.

@pchote
Copy link
Member Author

pchote commented Jan 16, 2021

Rebased now that #19006 has been merged.

INSTALL.md Outdated Show resolved Hide resolved
@pchote
Copy link
Member Author

pchote commented Jan 16, 2021

Updated.

@Mailaender Mailaender merged commit 765944c into OpenRA:bleed Jan 16, 2021
@Mailaender
Copy link
Member

Changelog

@pchote pchote deleted the net5-makefile branch April 8, 2021 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants