mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

Merge pull request #838 from DDRBoxman/cef

Browse Source 
CI: Fix cef version variable
This commit is contained in:
Gol-D-Ace 2017-03-01 22:28:41 +01:00 committed by GitHub
commit ed6c25e14b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CI/before-script-osx.sh
View File

@ -1,3 +1,3 @@
mkdir build
cd build
cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_$CEF_BUILD_VERSION_macosx64 ..
cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..

6
CI/install-dependencies-osx.sh
View File

@ -32,9 +32,9 @@ mkdir ./sparkle
tar -xf ./sparkle.tar.bz2 -C ./sparkle
# CEF Stuff
curl -kLO https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_$CEF_BUILD_VERSION_macosx64.tar.bz2 -f --retry 5 -C -
tar -xf ./cef_binary_$CEF_BUILD_VERSION_macosx64.tar.bz2
cd ./cef_binary_$CEF_BUILD_VERSION_macosx64
curl -kLO https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2 -f --retry 5 -C -
tar -xf ./cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
cd ./cef_binary_${CEF_BUILD_VERSION}_macosx64
mkdir build
cd ./build
cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..