Rangi42 / polished-map

A map and tileset editor for pokecrystal, pokered, and projects based on them. Written in C++ with FLTK.
https://hax.iimarckus.org/topic/7222/
Other
191 stars 22 forks source link

Sync macos branch with master + compilation fixes #79

Open vgmoose opened 1 year ago

vgmoose commented 1 year ago

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: https://github.com/Rangi42/polished-map/commit/3703e39f9922be3e8a06eb550f69d61d184ad1bf

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.