From 2c0f65c3ead274f628791702e29263ff212557ee Mon Sep 17 00:00:00 2001 From: jp9000 Date: Tue, 11 Sep 2018 01:29:13 -0700 Subject: [PATCH] obs-browser: Fix local macOS build issues (This also modifies the CI scripts accordingly) It was difficult to build local obs-browser builds on macOS due to the way the frameworks work and libraries are linked. This solves that issue so that local builds of obs-browser should always work fine. --- CI/before-script-osx.sh | 1 + plugins/obs-browser | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh index a0cf54ba2..7415b161b 100755 --- a/CI/before-script-osx.sh +++ b/CI/before-script-osx.sh @@ -11,4 +11,5 @@ cmake -DENABLE_SPARKLE_UPDATER=ON \ -DDepsPath=/tmp/obsdeps \ -DVLCPath=$PWD/../../vlc-master \ -DBUILD_BROWSER=ON \ +-DBROWSER_DEPLOY=ON \ -DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 .. diff --git a/plugins/obs-browser b/plugins/obs-browser index a32192875..da0b44930 160000 --- a/plugins/obs-browser +++ b/plugins/obs-browser @@ -1 +1 @@ -Subproject commit a321928756ae8ed4315d6d7b35a113e76493297c +Subproject commit da0b4493093230f076fb429d2fcda82f3ce1b247