Merged
Conversation
Contributor
|
Given that #473 has been open for about a year, I’m not sure where it sits in the maintainers’ queue. Just in case, I’ve rebased and force-pushed the PR branch of #473. If you rebase my branch onto yours, we can preserve the history. Then I can close my PR and we can keep this one up. I can do the rebase too, but I’d prefer you do it so GitHub doesn’t end up attributing me as a co-author on your commits. I tested that flow locally and it worked: everything compiles cleanly. |
Owner
|
I have been away for a while, I will review this soon. Thanks for the hard work. |
Owner
|
@tomkidd I merged the previous Mac OS work, so if you can rebase against that I can get this merged as well. :) |
This is based on two things. PR luciusDXL#473 from @apancik luciusDXL#473 The comment from @gilmorem560 that updated AngelScript code resolves compilation issues on Apple Silicon luciusDXL#90 (comment) https://www.angelcode.com/angelscript/ The code changes are sort of like a manual rebase of luciusDXL#473 so perhaps a proper rebase of that and the manual grafting of AngelScript would be a better solution. In any event I want to give credit to the people who really did the work.
clang doesn't like this one instruction on Intel so I commented it out
Necessary to get the engine to work in an App Bundle.
Contributor
Author
|
OK, I've rebased it. Thanks. |
luciusDXL
approved these changes
Jan 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR represents the changes I made to create the build I use on Mac Source Ports
https://www.macsourceports.com/game/swdf
As mentioned in the comments, it's a combination of PR #473 from @apancik, this comment from @gilmorem560 about updating AngelScript, and a couple of additional tweaks.
It might be better to rebase the original PR (I want to make sure credit is given where it's due), and one of the tweaks is App Bundle specific so I'm not sure if that's the best way to handle path names, but in any event here's my contribution upstream.