diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 75c10d668..580c67c54 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -292,7 +292,7 @@ jobs: codesign --force --options runtime --entitlements "../CI/scripts/macos/helpers/helper-renderer-entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/OBS Helper (Renderer).app" fi - codesign --force --options runtime --deep --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Resources/data/obs-mac-virtualcam.plugin" + codesign --force --options runtime --deep --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Resources/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin" codesign --force --options runtime --entitlements "../CI/scripts/macos/app/entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep ./OBS.app diff --git a/CI/full-build-macos.sh b/CI/full-build-macos.sh index 370006041..3e914cb0d 100755 --- a/CI/full-build-macos.sh +++ b/CI/full-build-macos.sh @@ -533,7 +533,7 @@ codesign_bundle() { step "Code-sign DAL Plugin..." /bin/echo -n "${COLOR_ORANGE}" - /usr/bin/codesign --force --options runtime --deep --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Resources/data/obs-mac-virtualcam.plugin" + /usr/bin/codesign --force --options runtime --deep --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Resources/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin" /bin/echo -n "${COLOR_RESET}" step "Code-sign OBS code..." diff --git a/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt b/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt index 9224985a3..5718ec930 100644 --- a/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt +++ b/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt @@ -104,6 +104,6 @@ add_custom_command(TARGET mac-dal-plugin add_custom_command(TARGET mac-dal-plugin POST_BUILD COMMAND rm -rf "${OBS_OUTPUT_DIR}/$/data/obs-mac-virtualcam.plugin" || true - COMMAND ${CMAKE_COMMAND} -E copy_directory ${TARGET_DIR}/obs-mac-virtualcam.plugin "${OBS_OUTPUT_DIR}/$/data/obs-mac-virtualcam.plugin" + COMMAND ${CMAKE_COMMAND} -E copy_directory ${TARGET_DIR}/obs-mac-virtualcam.plugin "${OBS_OUTPUT_DIR}/$/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin" COMMENT "Copy plugin to destination" ) diff --git a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm index 59f097ba1..18c17ff5c 100644 --- a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm +++ b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm @@ -58,7 +58,7 @@ static bool check_dal_plugin() if ([app bundleIdentifier] != nil) { NSURL *bundleURL = [app bundleURL]; NSString *pluginPath = - @"Contents/Resources/data/obs-mac-virtualcam.plugin"; + @"Contents/Resources/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin"; NSURL *pluginUrl = [bundleURL URLByAppendingPathComponent:pluginPath]; @@ -66,7 +66,7 @@ static bool check_dal_plugin() } else { dalPluginSourcePath = [[[[app executableURL] URLByAppendingPathComponent: - @"../data/obs-mac-virtualcam.plugin"] + @"../data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin"] path] stringByReplacingOccurrencesOfString:@"obs/" withString:@""];