Bladeren bron

CI: Update browser plugin ref and build scripts.

Hopefully this will fix a crash from CEF on 10.9
Colin Edwards 8 jaren geleden
bovenliggende
commit
770a9b7e67
3 gewijzigde bestanden met toevoegingen van 6 en 7 verwijderingen
  1. 1 1
      CI/before-script-osx.sh
  2. 4 5
      CI/install-dependencies-osx.sh
  3. 1 1
      plugins/obs-browser

+ 1 - 1
CI/before-script-osx.sh

@@ -1,3 +1,3 @@
 mkdir build
 cd build
-cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_3.2704.1434.gec3e9ed_macosx64 ..
+cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_3.2883.1540.gedbfb20_macosx64 ..

+ 4 - 5
CI/install-dependencies-osx.sh

@@ -8,13 +8,12 @@ tar -xf ./osx-deps.tar.gz -C /tmp
 
 # CEF Stuff
 cd ../
-curl -kLO http://opensource.spotify.com/cefbuilds/cef_binary_3.2704.1434.gec3e9ed_macosx64.tar.bz2
-tar -xf ./cef_binary_3.2704.1434.gec3e9ed_macosx64.tar.bz2
-cd ./cef_binary_3.2704.1434.gec3e9ed_macosx64
+curl -kLO http://opensource.spotify.com/cefbuilds/cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2
+tar -xf ./cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2
+cd ./cef_binary_3.2883.1540.gedbfb20_macosx64
 mkdir build
 cd ./build
-cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" ..
+cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..
 make -j4
 mkdir libcef_dll
-mv ./libcef_dll_wrapper/libcef_dll_wrapper.a ./libcef_dll/libcef_dll_wrapper.a
 cd ../../

+ 1 - 1
plugins/obs-browser

@@ -1 +1 @@
-Subproject commit ad115e71645e0f6edfbff51c74aecf25ab36bcc4
+Subproject commit 96f614a40c4682650c85dde666bf4e5e34b07c6a