Package OpenOMF for MacOS 26 #1428
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -220,7 +220,7 @@ omf_target_precompile_headers(openomf_core PUBLIC | |
| "<enet/enet.h>" | ||
| "<epoxy/gl.h>" | ||
| ) | ||
| if(CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU") | ||
| set_source_files_properties("${CMAKE_SOURCE_DIR}/src/vendored/argtable/argtable3.c" | ||
| PROPERTIES COMPILE_OPTIONS "-Wno-format-nonliteral" | ||
| ) | ||
|
|
@@ -480,6 +480,16 @@ set(DOC_FILES | |
| src/vendored/zip/LICENSE.zip | ||
| ) | ||
|
|
||
| if(APPLE) | ||
| set_target_properties(openomf PROPERTIES | ||
| MACOSX_BUNDLE TRUE | ||
| MACOSX_BUNDLE_BUNDLE_NAME "OpenOMF" | ||
| MACOSX_BUNDLE_GUI_IDENTIFIER "org.openomf.openomf" | ||
| MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_LABEL}" | ||
| MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_LABEL}" | ||
| ) | ||
| endif() | ||
|
|
||
| # Installation | ||
| if(WIN32) | ||
| # On windows, generate a flat directory structure under openomf/ subdir. | ||
|
|
@@ -488,6 +498,14 @@ if(WIN32) | |
| install(FILES resources/openomf.bk resources/gamecontrollerdb/gamecontrollerdb.txt DESTINATION openomf/resources/ COMPONENT Data) | ||
| install(DIRECTORY shaders/ DESTINATION openomf/shaders COMPONENT Data) | ||
| install(FILES ${DOC_FILES} DESTINATION openomf/ COMPONENT Data) | ||
| elseif(APPLE) | ||
| install(TARGETS openomf BUNDLE DESTINATION . RUNTIME DESTINATION bin COMPONENT Binaries) | ||
| install(FILES ${DOC_FILES} resources/openomf.bk resources/gamecontrollerdb/gamecontrollerdb.txt | ||
| resources/icons/openomf.png resources/flatpak/org.openomf.OpenOMF.desktop | ||
| DESTINATION openomf.app/Contents/Resources | ||
| COMPONENT Data | ||
| ) | ||
| install(DIRECTORY shaders/ DESTINATION openomf.app/Contents/shaders COMPONENT Data) | ||
| else() | ||
| # On unixy systems, follow standard. | ||
| install(TARGETS openomf RUNTIME DESTINATION bin COMPONENT Binaries) | ||
|
|
@@ -498,3 +516,36 @@ else() | |
| ) | ||
| install(DIRECTORY shaders/ DESTINATION share/games/openomf/shaders COMPONENT Data) | ||
| endif() | ||
|
|
||
| # Bundle in libSDL3.dylib since fixup_bundle() does not see the dependency. | ||
| if(APPLE) | ||
| find_package(SDL3 REQUIRED) | ||
| get_target_property(SDL3_LIBRARY_PATH SDL3::SDL3 LOCATION) | ||
| if(NOT SDL3_LIBRARY_PATH) | ||
| message(FATAL_ERROR "SDL3 not found") | ||
| endif() | ||
| message(STATUS "SDL3 is in ${SDL3_LIBRARY_PATH}") | ||
|
|
||
| set(SDL3_BUNDLE_SCRIPT "set(SDL3_LIBRARY_PATH [=[${SDL3_LIBRARY_PATH}]=])\n") | ||
|
|
||
| string(APPEND SDL3_BUNDLE_SCRIPT [[ | ||
| include(BundleUtilities) | ||
|
|
||
| set(APP_PATH "${CMAKE_INSTALL_PREFIX}/openomf.app") | ||
| set(CONTENTS_DIR "${APP_PATH}/Contents") | ||
|
|
||
| fixup_bundle("${APP_PATH}" "" "/opt/homebrew/lib;/usr/local/lib") | ||
| file(INSTALL "${SDL3_LIBRARY_PATH}" DESTINATION "${CONTENTS_DIR}/Frameworks" RENAME "libSDL3.dylib") | ||
|
Member
There was a problem hiding this comment.
Perhaps use
Member
There was a problem hiding this comment. I suspect we may run into trouble If this trouble does not occur, the manual file copy is good enough to stay-- considering an SDL3 port is inevitable, and will introduce a direct link dependency on SDL3, enabling fixup_bundle to grab SDL3 for us without any of this dancing around. Dumb idea: What if we linked SDL3 into the openomf target on macos? I wouldn't expect symbol conflicts between sdl2-compat and SDL3, and if the dep survives the linker, we've just successfully told |
||
|
|
||
| execute_process( | ||
| COMMAND codesign --force --sign - "${CONTENTS_DIR}/Frameworks/libSDL3.dylib" | ||
| COMMAND_ERROR_IS_FATAL ANY | ||
| ) | ||
| execute_process( | ||
| COMMAND codesign --force --identifier "org.openomf.openomf" --sign - "${APP_PATH}" | ||
| COMMAND_ERROR_IS_FATAL ANY | ||
| ) | ||
| ]]) | ||
|
|
||
| install(CODE "${SDL3_BUNDLE_SCRIPT}" COMPONENT Binaries) | ||
| endif() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
before merging, I imagine you'll want to set the build type back to Release
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably, or at least making a different run for the rec tests.