Revert "try to build osx version and xenial docker version"

This reverts commit a265cea4fb6416b1ea88e61d20e15ddb84aea613.
This commit is contained in:
asquelt 2017-04-04 19:03:52 +02:00
parent a265cea4fb
commit a6ab35f1fb

View File

@ -2,10 +2,10 @@
set -ex set -ex
# OBS Studio deps # OBS Studio deps
add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" -y sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" -y
add-apt-repository ppa:kirillshkrogalev/ffmpeg-next -y sudo add-apt-repository ppa:kirillshkrogalev/ffmpeg-next -y
apt-get -qq update sudo apt-get -qq update
apt-get install -y \ sudo apt-get install -y \
build-essential \ build-essential \
checkinstall \ checkinstall \
cmake \ cmake \
@ -39,7 +39,7 @@ apt-get install -y \
qtbase5-dev qtbase5-dev
# qtwebsockets deps # qtwebsockets deps
apt-get install -y qt5-qmake qtbase5-private-dev qtcreator sudo apt-get install -y qt5-qmake qtbase5-private-dev qtcreator
# obs-websocket deps # obs-websocket deps
#cd .. #cd ..
@ -48,8 +48,8 @@ apt-get install -y qt5-qmake qtbase5-private-dev qtcreator
#git checkout v5.3.0 #git checkout v5.3.0
#qmake #qmake
#make -j4 #make -j4
#make install #sudo make install
apt-get install -y libqt5websockets5-dev sudo apt-get install -y libqt5websockets5-dev
# Build obs-studio # Build obs-studio
cd .. cd ..
@ -58,6 +58,6 @@ cd obs-studio
mkdir build && cd build mkdir build && cd build
cmake -DUNIX_STRUCTURE=1 -DCMAKE_INSTALL_PREFIX=/usr .. cmake -DUNIX_STRUCTURE=1 -DCMAKE_INSTALL_PREFIX=/usr ..
make -j4 make -j4
make install sudo make install
ldconfig sudo ldconfig