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

Sync macos branch with master + compilation fixes #79

Open
wants to merge 131 commits into
base: macos
Choose a base branch
from

Conversation

vgmoose
Copy link

@vgmoose vgmoose commented Oct 31, 2023

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: (from this 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):

brew install pkg-config libpng libxpm
git clone https://github.com/fltk/fltk.git
cd fltk
make && make install
cd ..
git clone https://github.com/vgmoose/polished-map.git
make
./bin/polishedmap
Screenshot 2023-10-30 at 11 40 32 PM

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.

…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
Rangi42 and others added 30 commits August 24, 2021 17:47
Map filename-to-constant conversion ignores case on Windows when guessing tilesets

Fixes Rangi42#56
e.g. "TILESET_JOHTO_MODERN" = "johto_modern", not "johtomodern")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants