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

macOS Tiger platform and instructions #7578

Merged
merged 7 commits into from
Dec 12, 2024
Merged

Conversation

glebm
Copy link
Collaborator

@glebm glebm commented Dec 9, 2024

PXL_20241211_150048933

This required a few workarounds, the trickiest one in the last commit of this PR.
We can also backport this to the 1.5 branch for the 1.5.4 release.

I haven't tested netplay between big-endian and little-endian machines but I'm guessing it is still broken.

devilutionx_tiger_ppc.dmg.zip

/cc @kencu @barracuda156 @mascguy

@glebm glebm force-pushed the tiger-macports branch 2 times, most recently from 37782c1 to 63c5e23 Compare December 9, 2024 07:44
@AJenbo
Copy link
Member

AJenbo commented Dec 9, 2024

When testing with SDL 1.2.15 from Tigerbrew I noticed that it's just dumping the saves and settings in the home folder so we need a Tinger/macOS addition to our implementation of SDL_GetPrefPath() in sdl2_to_1_2_backports.cpp

@glebm
Copy link
Collaborator Author

glebm commented Dec 9, 2024

Yeah I see the issue with the paths:

image

@glebm glebm force-pushed the tiger-macports branch 3 times, most recently from 1eeec52 to d1100d0 Compare December 10, 2024 04:13
@AJenbo
Copy link
Member

AJenbo commented Dec 10, 2024

Nice that you figured out the issue with the icon :)

docs/building.md Outdated Show resolved Hide resolved
docs/building.md Outdated Show resolved Hide resolved
@glebm glebm force-pushed the tiger-macports branch 3 times, most recently from a3e1b4b to faf70b0 Compare December 10, 2024 19:03
@glebm glebm force-pushed the tiger-macports branch 8 times, most recently from dd6d51d to f7db7d6 Compare December 11, 2024 12:05
Finder on OSX Tiger can only handle `icns` files with up to 128x128 icons.

Adds a file with 128x128, 48x48, 32x32, and 16x16 icons.
@barracuda156
Copy link

@glebm Have you taken a look at SDL2? As of now, it probably won’t work for games, since joystick module needs to be fixed, but video works via x11.

Pushing events from a background thread on Tiger + SDL1
does not appear to do anything at all.

I don't know if the issue is limited to Tiger,
so apply the workaround on all macOS when using SDL1.
@glebm
Copy link
Collaborator Author

glebm commented Dec 11, 2024

@barracuda156 X11 server doesn't build from the current MacPorts due to https://trac.macports.org/ticket/62654
It's probably possible to build an older version but SDL1 appears to work well enough

With this PR, DevilutionX should be buildable from upstream MacPorts!

@barracuda156
Copy link

@glebm I see. I have probably built it only on 10.5 and 10.6 on PowerPC.
SDL2 itself builds on Tiger, but with a couple of extra disablings (and will be useless without X server anyway).

@glebm glebm marked this pull request as ready for review December 11, 2024 16:47
@glebm glebm enabled auto-merge (rebase) December 11, 2024 16:48
@glebm
Copy link
Collaborator Author

glebm commented Dec 11, 2024

DMG uploaded (see PR description)!

@AJenbo
Copy link
Member

AJenbo commented Dec 12, 2024

@glebm Have you taken a look at SDL2? As of now, it probably won’t work for games, since joystick module needs to be fixed, but video works via x11.

@barracuda156 joystick support isn't required, it does throw an error because it fails to init it, but if you ignore that it works fien. From what I read the joystick issue originated in a bug in GCC as should be solved now that we have upgraded to GCC14 so the patch that disables it can probably be removed, but we can't currently test it because of the mentioned issues around building x11.

Comment on lines +563 to +571

To run tools from the `tools/` directory (only needed for development), you also need Python:

~~~ bash
sudo port install python312
sudo port select --set python python312
sudo port select --set python3 python312
~~~

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While not an issue I have a hard time seeing who would do so :D

Copy link
Member

@AJenbo AJenbo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oddly having a target where the threaded loading isn't working properly makes me feel the solution is more robust 👍

@AJenbo AJenbo disabled auto-merge December 12, 2024 02:18
@AJenbo AJenbo merged commit f798556 into diasurgical:master Dec 12, 2024
21 of 23 checks passed
@glebm glebm deleted the tiger-macports branch December 12, 2024 09:18
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