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 Game Mode Support for 2Ship2Harkinian #811

Merged
merged 27 commits into from
Feb 5, 2025

Conversation

larsy1995
Copy link
Contributor

@larsy1995 larsy1995 commented Oct 15, 2024

Adds the necessary changes by Archez and me to the packaging-2.cmake and info.plist files that will allow Game Mode support in 2Ship2Harkinian.
Should not be merged until https://github.com/Kenix3/libultraship/pull/690 gets merged into 2Ship2Harkinian.

Build Artifacts

@larsy1995
Copy link
Contributor Author

Moved the directory & file creation and existence logic out of ship and into port.

My builds have gotten double their original size since I started taking care of them and I feel bad about it :(
Removed the bash script and its references
@larsy1995
Copy link
Contributor Author

This should be able to be merged as well. Will look at that conflict later. LUS already has my PR merged, so that is fine.

@larsy1995
Copy link
Contributor Author

larsy1995 commented Feb 3, 2025

Nvm, it has not been updated in 2Ship. Will have to wait for LUS to be bumped then.

@larsy1995
Copy link
Contributor Author

Unless I have done something weird while updating my code, this should have the newer version of the game mode implementation that Archez added to SoH. And should probably be fine to merge now that LUS has been bumped for real this time.

.gitignore Outdated Show resolved Hide resolved
mm/CMakeLists.txt Show resolved Hide resolved
mm/macosx/Info.plist.in Outdated Show resolved Hide resolved
OTRExporter Outdated Show resolved Hide resolved
libultraship Outdated Show resolved Hide resolved
@Archez
Copy link
Contributor

Archez commented Feb 5, 2025

otool -L output looks good

2ship-mac/2s2h.app/Contents/MacOS/2s2h:
	@executable_path/../Frameworks/libSDL2-2.0.0.dylib (compatibility version 3001.0.0, current version 3001.12.0)
	@executable_path/../Frameworks/libz.1.dylib (compatibility version 1.0.0, current version 1.3.1)
	@executable_path/../Frameworks/libbz2.1.0.dylib (compatibility version 1.0.0, current version 1.0.8)
	@executable_path/../Frameworks/libGLEW.2.2.0.dylib (compatibility version 2.2.0, current version 2.2.0)
	/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL (compatibility version 1.0.0, current version 1.0.0)
	@executable_path/../Frameworks/libzip.5.dylib (compatibility version 6.0.0, current version 6.5.0)
	@executable_path/../Frameworks/libtinyxml2.10.dylib (compatibility version 10.0.0, current version 10.0.0)
	/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (compatibility version 300.0.0, current version 2503.1.0)
	/System/Library/Frameworks/AVFoundation.framework/Versions/A/AVFoundation (compatibility version 1.0.0, current version 2.0.0)
	/System/Library/Frameworks/Metal.framework/Versions/A/Metal (compatibility version 1.0.0, current version 343.19.0)
	/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore (compatibility version 1.2.0, current version 1.11.0)
	@executable_path/../Frameworks/libpng16.16.dylib (compatibility version 62.0.0, current version 62.0.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 1700.255.5)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1345.120.2)
	/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 2503.1.0)
	/usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current version 228.0.0)

@Archez Archez merged commit ac1ad42 into HarbourMasters:develop Feb 5, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants