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

Backport macOS Tiger changes to 1.5 #7585

Merged
merged 4 commits into from
Dec 15, 2024
Merged

Backport macOS Tiger changes to 1.5 #7585

merged 4 commits into from
Dec 15, 2024

Conversation

glebm
Copy link
Collaborator

@glebm glebm commented Dec 14, 2024

Backports #7578 and #7583 to the 1.5 branch

Finder on OSX Tiger can only handle `icns` files with up to 128x128 icons.

Adds a file with 128x128, 48x48, 32x32, and 16x16 icons.
1. Load assets from the bundle on Mac.
2. In timedemo_test, load MPQs before overriding pref path,
   so that they can also be loaded from the user/system location.
3. Fix various double directory separators ("build//assets" etc).
@glebm glebm marked this pull request as ready for review December 15, 2024 15:56
@glebm
Copy link
Collaborator Author

glebm commented Dec 15, 2024

Tested a release build, all good

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.

Should we also backport the Win9x support 🤔

@AJenbo AJenbo merged commit 2b6ba8c into diasurgical:1.5 Dec 15, 2024
20 checks passed
@StephenCWills StephenCWills added this to the 1.5.4 milestone Dec 15, 2024
@glebm glebm deleted the 1.5-tiger branch December 15, 2024 20:18
@glebm
Copy link
Collaborator Author

glebm commented Dec 16, 2024

Don't think I'll have the time, lots of Christmas prep to do!

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