diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fcbed0fd..996b52610 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -276,8 +276,6 @@ if(NOT INSTALLER_RUN) if (BUILD_TESTS OR ENABLE_UNIT_TESTS) add_subdirectory(test) endif() - - add_subdirectory(cmake/helper_subdir) else() obs_generate_multiarch_installer() endif() diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index 250545148..a40a6356e 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -111,17 +111,6 @@ else() set(OBS_SCRIPT_PLUGIN_PATH "${OBS_INSTALL_PREFIX}${OBS_SCRIPT_PLUGIN_DESTINATION}") endif() -function(obs_finish_bundle) - if(NOT APPLE OR UNIX_STRUCTURE) - return() - endif() - - install(CODE - "if(DEFINED ENV{FIXUP_BUNDLE}) - execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/cmake/osxbundle/fixup_bundle.sh\" . bin WORKING_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}\") - endif()") -endfunction() - function(obs_generate_multiarch_installer) install(DIRECTORY "$ENV{obsInstallerTempDir}/" DESTINATION "." diff --git a/cmake/helper_subdir/CMakeLists.txt b/cmake/helper_subdir/CMakeLists.txt deleted file mode 100644 index d644c9f19..000000000 --- a/cmake/helper_subdir/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ - -obs_finish_bundle() - diff --git a/cmake/osxbundle/Info.plist b/cmake/osxbundle/Info.plist deleted file mode 100644 index 437d36666..000000000 --- a/cmake/osxbundle/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleIconFile - OBS.icns - CFBundleName - OBS - CFBundleExecutable - OBS - CFBundleIdentifier - com.obsproject.obs-studio - CFBundlePackageType - APPL - CFBundleSignature - ???? - LSMinimumSystemVersion - 10.8.5 - NSHighResolutionCapable - - LSAppNapIsDisabled - - NSCameraUsageDescription - OBS needs to access the camera to enable camera sources to work. - NSMicrophoneUsageDescription - OBS needs to access the microphone to enable audio input. - - diff --git a/cmake/osxbundle/fixup_bundle.sh b/cmake/osxbundle/fixup_bundle.sh deleted file mode 100755 index 7eb501dde..000000000 --- a/cmake/osxbundle/fixup_bundle.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -if [ "$#" != 2 ]; then - echo "usage: $0 /path/to/install/root relative/lib/destination" - exit 1 -fi - -cd "$1" - -function buildlist() { - otool -L "$@" | - grep -E '^\s+/' | - grep -vE '^\s+/System/' | - grep -vE '^\s+/usr/lib/' | - perl -pe 's|^\s+(/.*)\s\(.*$|$1|' | - grep -vE ":$" | - sort -u -} -export -f buildlist - -DEST="$2" -LDEST="@rpath" -TARGETS="$(find . \( -perm +111 -and -type f \))" -FOUNDLIBS="$(buildlist $TARGETS)" -PFOUNDLIBS="" - -while [ "$FOUNDLIBS" != "$PFOUNDLIBS" ]; do - PFOUNDLIBS="$FOUNDLIBS" - FOUNDLIBS="$(buildlist $TARGETS $PFOUNDLIBS)" -done - -INTOOL_CALL=() - -for lib in $FOUNDLIBS; do - libname="$(basename "$lib")" - - INTOOL_CALL+=(-change "$lib" "$LDEST/$libname") - cp "$lib" "$DEST/$libname" - chmod 644 "$DEST/$libname" - - echo "Fixing up dependency: $libname" -done - -for lib in $FOUNDLIBS; do - libname="$(basename "$lib")" - lib="$DEST/$libname" - - install_name_tool ${INTOOL_CALL[@]} -id "$LDEST/$libname" "$lib" -done - -for target in $TARGETS; do - install_name_tool ${INTOOL_CALL[@]} "$target" -done - diff --git a/cmake/osxbundle/obs.icns b/cmake/osxbundle/obs.icns deleted file mode 100644 index 6f878d6a3..000000000 Binary files a/cmake/osxbundle/obs.icns and /dev/null differ diff --git a/cmake/osxbundle/obslaunch.sh b/cmake/osxbundle/obslaunch.sh deleted file mode 100755 index 18a80db83..000000000 --- a/cmake/osxbundle/obslaunch.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd "$(dirname "$0")" -cd ../Resources/bin -exec ./obs "$@" -