Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS CI: properly use Qt from Homebrew

Browse Source
This commit is contained in:
Stéphane L 2017-08-06 22:28:07 +02:00
parent 9e3ce26ba0
commit 6b6b7feff2
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CI/build-osx.sh
View File

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
set -ex set -ex
export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)" #export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
mkdir build && cd build mkdir build && cd build
cmake .. \ cmake .. \
-DQTDIR="$QT_PREFIX" \ -DQTDIR=/usr/local/opt/qt \
-DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \ -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \
-DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \ -DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \

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

@ -7,8 +7,9 @@ brew install ffmpeg
brew install libav brew install libav
# qtwebsockets deps # qtwebsockets deps
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/fdb7c6e960e830b3bf630850c0002c5df9f68ed8/Formula/qt5.rb brew versions qt5
echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)" brew install qt5
#echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
# Build obs-studio # Build obs-studio
cd .. cd ..
@ -17,7 +18,7 @@ cd obs-studio
git checkout 19.0.3 git checkout 19.0.3
mkdir build && cd build mkdir build && cd build
cmake .. \ cmake .. \
-DCMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake \ -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \
&& make -j4 && make -j4
sudo make install sudo make install

12
CI/package-osx.sh
View File

@ -3,7 +3,7 @@
set -e set -e
echo "-- Preparing package build" echo "-- Preparing package build"
export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)" #export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
export WS_LIB="$QT_PREFIX/lib/QtWebSockets.framework/QtWebSockets" export WS_LIB="$QT_PREFIX/lib/QtWebSockets.framework/QtWebSockets"
export NET_LIB="$QT_PREFIX/lib/QtNetwork.framework/QtNetwork" export NET_LIB="$QT_PREFIX/lib/QtNetwork.framework/QtNetwork"
@ -28,15 +28,15 @@ chmod +rw ./build/QtWebSockets ./build/QtNetwork
echo "-- Modifying QtNetwork" echo "-- Modifying QtNetwork"
install_name_tool \ install_name_tool \
-change /usr/local/opt/qt5/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \ -change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \
-change "$QT_PREFIX/lib/QtCore.framework/Versions/5/QtCore" @rpath/QtCore \ -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \
./build/QtNetwork ./build/QtNetwork
echo "-- Modifying QtWebSockets" echo "-- Modifying QtWebSockets"
install_name_tool \ install_name_tool \
-change /usr/local/opt/qt5/lib/QtWebSockets.framework/Versions/5/QtWebSockets @rpath/QtWebSockets \ -change /usr/local/opt/qt/lib/QtWebSockets.framework/Versions/5/QtWebSockets @rpath/QtWebSockets \
-change $QT_PREFIX/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \ -change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \
-change $QT_PREFIX/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \ -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \
./build/QtWebSockets ./build/QtWebSockets
echo "-- Modifying obs-websocket.so" echo "-- Modifying obs-websocket.so"