diff --git a/CI/before-deploy-osx.sh b/CI/before-deploy-osx.sh index 4e698b82f..ceb70ac99 100755 --- a/CI/before-deploy-osx.sh +++ b/CI/before-deploy-osx.sh @@ -19,6 +19,10 @@ hr "Moving CEF out to preserve linking" mv ./rundir/RelWithDebInfo/obs-plugins/CEF.app ./ mv ./rundir/RelWithDebInfo/obs-plugins/obs-browser.so ./ +# Move obslua +hr "Moving OBS LUA" +mv ./rundir/RelWithDebInfo/data/obs-scripting/obslua.so ./rundir/RelWithDebInfo/bin/ + # Package everything into a nice .app hr "Packaging .app" STABLE=false diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index 2faa02a71..fbe7e78d2 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -6,10 +6,6 @@ set -v git fetch --unshallow -# Fix ruby issue on OSX https://github.com/travis-ci/travis-ci/issues/6307 -gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -rvm get stable - # Leave obs-studio folder cd ../ diff --git a/CI/util/build-package-deps-osx.sh b/CI/util/build-package-deps-osx.sh index 077cfc6d2..12fb805b9 100755 --- a/CI/util/build-package-deps-osx.sh +++ b/CI/util/build-package-deps-osx.sh @@ -129,7 +129,7 @@ unzip ./n3.2.2.zip cd ./FFmpeg-n3.2.2 mkdir build cd ./build -../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-shared --disable-static --shlibdir="/tmp/obsdeps/bin" --enable-gpl --disable-doc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx +../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-shared --disable-static --shlibdir="/tmp/obsdeps/bin" --enable-gpl --disable-doc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx --disable-outdev=sdl make -j 12 find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \; rsync -avh --include="*/" --include="*.h" --exclude="*" ../* $DEPS_DEST/include/