Skip to content

Commit

Permalink
Revert "cmake: Align Product Name and Bundle Name on macOS"
Browse files Browse the repository at this point in the history
This reverts commit 9f66c23.

This commit caused a crash in CEF on startup for many users. Let's just
revert it asap for now and worry about the minor problem it was solving
another time.
  • Loading branch information
gxalpha authored and PatTheMav committed Dec 10, 2023
1 parent 263e027 commit baa3243
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 1 addition & 3 deletions .github/scripts/.build.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,12 @@ build() {
if [[ ${GITHUB_EVENT_NAME} == push && ${GITHUB_REF_NAME} =~ [0-9]+.[0-9]+.[0-9]+(-(rc|beta).+)? ]] {
run_xcodebuild ${archive_args}
run_xcodebuild ${export_args}

mv "OBS Studio.app" OBS.app
} else {
run_xcodebuild ${build_args}

rm -rf OBS.app
mkdir OBS.app
ditto "UI/${config}/OBS Studio.app" OBS.app
ditto UI/${config}/OBS.app OBS.app
}
popd
;;
Expand Down
5 changes: 2 additions & 3 deletions cmake/macos/helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function(set_target_properties_obs target)
if(target STREQUAL obs-studio)
set_target_properties(
${target}
PROPERTIES OUTPUT_NAME "OBS Studio"
PROPERTIES OUTPUT_NAME OBS
MACOSX_BUNDLE TRUE
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY YES
Expand All @@ -62,7 +62,7 @@ function(set_target_properties_obs target)
set_target_xcode_properties(
${target}
PROPERTIES PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-studio
PRODUCT_NAME "OBS Studio"
PRODUCT_NAME OBS
ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER}
MARKETING_VERSION ${OBS_VERSION_CANONICAL}
Expand All @@ -75,7 +75,6 @@ function(set_target_properties_obs target)
INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2012-${CURRENT_YEAR} Lain Bailey"
INFOPLIST_KEY_NSCameraUsageDescription "OBS needs to access the camera to enable camera sources to work."
INFOPLIST_KEY_NSMicrophoneUsageDescription "OBS needs to access the microphone to enable audio input.")

# cmake-format: on

get_property(obs_dependencies GLOBAL PROPERTY _OBS_DEPENDENCIES)
Expand Down

0 comments on commit baa3243

Please sign in to comment.