-
Notifications
You must be signed in to change notification settings - Fork 22
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
Sync macos branch with master + compilation fixes #79
Open
vgmoose
wants to merge
131
commits into
Rangi42:macos
Choose a base branch
from
vgmoose:master
base: macos
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains 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
…izes If there are an even N choices, indexed 0 to N-1, pick (N-1)/2, not N/2. This will have greater width than height, which is usually correct (10x9 not 9x10, 20x18 not 18x20, etc).
If a .2bpp file in the tileset graphics directory is not really a tileset (like water.2bpp), then just don't pick it
…onding third ROOF color (meant for evening)
Map filename-to-constant conversion ignores case on Windows when guessing tilesets Fixes Rangi42#56
e.g. "TILESET_JOHTO_MODERN" = "johto_modern", not "johtomodern")
Fixes Rangi42#63 Also fixes freeing memory
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Thank you for this project! This PR is targeting the
macos
branch, to bring it up to date and compile/run on the latest macOS (intended to address #62).The commit history here is overly verbose since it shows all commits from
master
->macos
, but it's easier to see the changes in the other direction: (fromthis PR
->master
):And then besides the merge commit, the new changes for the macos branch are in the last commit: 3703e39
If the merge conflicts were resolved correctly, the only main change is in the Makefile. This was compiled and tested on an M1 Pro macbook pro. I can do other tests as needed as well.
To replicate (install deps, latest fltk, build and run):
I didn't try the Wine solution mentioned by @ss-aa-mm but it might be interesting to see how this build compares with that one in terms of functionality.