Skip to content

Commit

Permalink
builds docs based on master
Browse files Browse the repository at this point in the history
  • Loading branch information
ronag authored Feb 21, 2018
1 parent b047f47 commit 6274fc6
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Development using Visual Studio

2. Install CMake (http://www.cmake.org/download/).

3. `git clone --single-branch --branch 2.2.0 https://github.com/CasparCG/server casparcg-server-2.2.0`
3. `git clone --single-branch --branch master https://github.com/CasparCG/server casparcg-server-master`

4. `cd casparcg-server-2.2.0`
4. `cd casparcg-server-master`

5. `mkdir build`

Expand All @@ -37,8 +37,8 @@ Linux
Building inside Docker
----------------------

1. `git clone --single-branch --branch 2.2.0 https://github.com/CasparCG/server casparcg-server-2.2.0`
2. `cd casparcg-server-2.2.0`
1. `git clone --single-branch --branch master https://github.com/CasparCG/server casparcg-server-master`
2. `cd casparcg-server-master`
3. `tools/linux/build-in-docker`

If all goes to plan, a docker image has been created containing CasparCG Server.
Expand All @@ -56,9 +56,9 @@ Development
1. Install dependencies `apt-get install .... (coming soon)`
2. Build boost and ffmpeg as per the docker images inside of `tools/linux` they should be saved in `/opt/boost` and `/opt/ffmpeg`
3. Download CEF from the link near the top of `tools/linux/Dockerfile`, and extract to `/opt/cef`
4. `git clone --single-branch --branch 2.2.0 https://github.com/CasparCG/server` casparcg-server-2.2.0
5. `mkdir casparcg-server-2.2.0-build && cd casparcg-server-2.2.0-build`
6. `cmake ../casparcg-server-2.2.0`
4. `git clone --single-branch --branch master https://github.com/CasparCG/server` casparcg-server-master
5. `mkdir casparcg-server-master-build && cd casparcg-server-master-build`
6. `cmake ../casparcg-server-master
7. `make -j8`

If all goes to plan, a folder called 'staging' has been created with everything you need to run CasparCG server.

0 comments on commit 6274fc6

Please sign in to comment.