Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

diff --git a/CHANGELOG b/CHANGELOG
index 765a1c5d13eac85d08736fdd1f659fe820bc316e..41d42c408298aa7138a07197a989ba5558b3a855 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,8 @@ General
   o Copy casparcg_auto_restart.bat into Windows releases.\r
   o Fixed bug with thumbnail generation when there are .-files in the media\r
     folder.\r
+  o Removed CMake platform specification in Linux build script\r
+    (Krzysztof Pyrkosz).\r
 \r
 Consumers\r
 ---------\r

diff --git a/build-scripts/build-linux.sh b/build-scripts/build-linux.sh
index 338d9780a0504fb2f8c29063460a95ec2521c51a..90112538fbaf51c6d9de6cd8faf5fb90b0ce3545 100755 (executable)
--- a/build-scripts/build-linux.sh
+++ b/build-scripts/build-linux.sh
@@ -25,7 +25,7 @@ cd ../build || fail "Could not enter ../build"
 
 # Run cmake
 echo Running cmake...
-cmake -G "Unix Makefiles" -A x64 -DCMAKE_BUILD_TYPE=RelWithDebInfo .. || fail "cmake failed"
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo .. || fail "cmake failed"
 
 # Run make using the number of hardware threads in BUILD_PARALLEL_THREADS
 echo Building...