diff --git a/Build/Vlc4LinuxCloneMakeInstall.sh b/Build/Vlc4LinuxCloneMakeInstall.sh index 607e96e5..cc918b90 100755 --- a/Build/Vlc4LinuxCloneMakeInstall.sh +++ b/Build/Vlc4LinuxCloneMakeInstall.sh @@ -31,6 +31,7 @@ sudo apt install gperf default-jdk ant flex flex-old bison sudo apt install libcaca-dev libncursesw5-dev libasound2-dev lua5.2-dev libxcb-keysyms1-dev sudo apt install lua5.2 openjdk-8-jdk ant nasm libxcb-composite0 libxcb-composite0-dev sudo apt install libxcb-xv0 libxcb-xv0-dev wayland-protocols +sudo apt install libavutil-dev libavcodec-dev libavformat-dev libswscale-dev libxcb-randr0-dev # Protocol Buffers - Google's data interchange format git clone git://github.com/google/protobuf.git diff --git a/Build/Vlc4LinuxMakeInstall.sh b/Build/Vlc4LinuxMakeInstall.sh index fc5646ff..7569f710 100755 --- a/Build/Vlc4LinuxMakeInstall.sh +++ b/Build/Vlc4LinuxMakeInstall.sh @@ -31,6 +31,7 @@ sudo apt install gperf default-jdk ant flex flex-old bison sudo apt install libcaca-dev libncursesw5-dev libasound2-dev lua5.2-dev libxcb-keysyms1-dev sudo apt install lua5.2 openjdk-8-jdk ant nasm libxcb-composite0 libxcb-composite0-dev sudo apt install libxcb-xv0 libxcb-xv0-dev wayland-protocols +sudo apt install libavutil-dev libavcodec-dev libavformat-dev libswscale-dev libxcb-randr0-dev # Protocol Buffers - Google's data interchange format #git clone git://github.com/google/protobuf.git diff --git a/Build/clang-5.0.sh b/Build/clang-5.0.sh new file mode 100755 index 00000000..654b6c63 --- /dev/null +++ b/Build/clang-5.0.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -x + +# https://askubuntu.com/questions/907873/how-to-set-clang-3-9-as-the-default-in-zesty + +sudo apt update +sudo apt upgrade +sudo apt autoremove + +sudo apt install clang clang-5.0 + +sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/lib/llvm-5.0/bin/clang++ 100 +sudo update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-5.0/bin/clang 100 + +sudo update-alternatives --config clang + +clang --version + diff --git a/README.md b/README.md index 868279a2..9405888d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ that are not yet available in the UE4 Master branch. This plug-in was last built against **Unreal Engine 4.19** and tested against the following platforms: -- Linux (Ubuntu 16.04) +- Linux (Ubuntu 18.04 LTS (Bionic Beaver)) - ~~Mac~~ - Windows @@ -54,7 +54,7 @@ Nightly builds can be downloaded from the VideoLAN web site (see below). For debugging on Win32 and Win64, you can download debug builds and replace the corresponding files and folders in the *VlcMedia/ThirdParty/vlc/* directory. -### Linux (Ubuntu 16.04) +### Linux (Ubuntu 18.04 LTS (Bionic Beaver)) A suitable version of **libvlc** must be installed or compiled from source. If you ship your game on Linux, you will likely want to include libvlc with it, so @@ -68,6 +68,9 @@ run the *VlcMedia/Build/Vlc4LinuxCloneMakeInstall.sh* script from within your project's root folder. If you later need to make and re-install VLC from the existing VLC code, run the *Vlc4LinuxMakeInstall.sh* script instead. +To use clang-5.0 (llvm-5.0) as default clang compiler for Ubuntu 18.04 LTS, +run the *VlcMedia/Build/clang-5.0.sh* script. + ### Mac, Windows All required libraries and plug-ins are included in the *ThirdParty* directory