LIV2/amiberry
1
0
Fork 0
mirror of https://github.com/LIV2/amiberry.git synced 2025-12-05 22:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: fix bundled plugins on MacOS (#1540) (#1541)

Browse Source 
The bundled plugins of capsimg and floppybridge, were not included in the final app bundle.
Furthermore, they need to be signed with the same digital certificate, otherwise MacOS will block them from loading.
This commit is contained in:
Dimitris Panokostas 2024-12-19 16:38:38 +01:00 committed by GitHub
parent f967df0ace
commit 357cb2de4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/c-cpp.yml vendored
View File

@ -58,6 +58,11 @@ jobs:
codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file
fi fi
done done
for file in build/Amiberry.app/Contents/Resources/plugins/*.dylib; do
if [ -f "$file" ]; then
codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file
fi
done
- name: Codesign the app - name: Codesign the app
run: | run: |
@ -140,6 +145,11 @@ jobs:
codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file
fi fi
done done
for file in build/Amiberry.app/Contents/Resources/plugins/*.dylib; do
if [ -f "$file" ]; then
codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file
fi
done
- name: Codesign the app - name: Codesign the app
run: | run: |

8
cmake/macos/CMakeLists.txt
View File

@ -21,11 +21,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
$<TARGET_FILE:capsimage> $<TARGET_FILE:capsimage>
$<TARGET_FILE_DIR:${PROJECT_NAME}>/../Frameworks/$<TARGET_FILE_NAME:capsimage>) $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Resources/plugins/$<TARGET_FILE_NAME:capsimage>)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
$<TARGET_FILE:floppybridge> $<TARGET_FILE:floppybridge>
$<TARGET_FILE_DIR:${PROJECT_NAME}>/../Frameworks/$<TARGET_FILE_NAME:floppybridge>) $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Resources/plugins/$<TARGET_FILE_NAME:floppybridge>)
# Gather all dependencies with dylibbundler # Gather all dependencies with dylibbundler
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
@ -33,9 +33,9 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
if (NOT "${CMAKE_GENERATOR}" MATCHES "Xcode") if (NOT "${CMAKE_GENERATOR}" MATCHES "Xcode")
install(FILES $<TARGET_FILE:capsimage> install(FILES $<TARGET_FILE:capsimage>
DESTINATION $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Frameworks/) DESTINATION $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Resources/plugins/)
install(FILES $<TARGET_FILE:floppybridge> install(FILES $<TARGET_FILE:floppybridge>
DESTINATION $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Frameworks/) DESTINATION $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Resources/plugins/)
# This one contains the gamecontrollersdb.txt file # This one contains the gamecontrollersdb.txt file
install(DIRECTORY ${CMAKE_SOURCE_DIR}/controllers install(DIRECTORY ${CMAKE_SOURCE_DIR}/controllers

12
src/osdep/amiberry.cpp
View File

@ -4006,7 +4006,17 @@ void create_missing_amiberry_folders()
if (!my_existsdir(config_path.c_str())) if (!my_existsdir(config_path.c_str()))
my_mkdir(config_path.c_str()); my_mkdir(config_path.c_str());
if (!my_existsdir(plugins_dir.c_str())) if (!my_existsdir(plugins_dir.c_str()))
my_mkdir(plugins_dir.c_str()); {
my_mkdir(plugins_dir.c_str());
#ifdef __MACH__
const std::string bundled_plugins_path = app_directory + "/Resources/plugins/";
if (my_existsdir(bundled_plugins_path.c_str()))
{
const std::string command = "cp -r " + bundled_plugins_path + "* " + plugins_dir;
system(command.c_str());
}
#endif
}
if (!my_existsdir(controllers_path.c_str())) if (!my_existsdir(controllers_path.c_str()))
{ {
my_mkdir(controllers_path.c_str()); my_mkdir(controllers_path.c_str());