[scene] Include LiberationSans-Regular into distribution for use by text producer.

[casparcg] / build-scripts / build-linux.sh

diff --git a/build-scripts/build-linux.sh b/build-scripts/build-linux.sh
index 0ee553c1a6186b310c208154d7084e782fcc3753..a214b73ae5dd04b85630762ae1c32477ef64d2eb 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...
@@ -44,10 +44,10 @@ mkdir "$SERVER_FOLDER/lib" || fail "Could not create $SERVER_FOLDER/lib"
 echo Copying binaries...
 cp -f  shell/lib* "$SERVER_FOLDER/lib/" || fail "Could not copy server libraries"
 cp -f  shell/*.ttf "$SERVER_FOLDER/" || fail "Could not copy font(s)"
-cp -f  shell/*.pak "$SERVER_FOLDER/" || fail "Could not copy font(s)"
 cp -f  shell/casparcg "$SERVER_FOLDER/bin/" || fail "Could not copy server executable"
 cp -f  shell/casparcg.config "$SERVER_FOLDER/" || fail "Could not copy server config"
 cp -Rf shell/locales "$SERVER_FOLDER/bin/" || fail "Could not copy server CEF locales"
+cp -f  shell/*.pak "$SERVER_FOLDER/" || fail "Could not copy CEF resources"
 
 # Copy binary dependencies
 echo Copying binary dependencies...
@@ -55,6 +55,8 @@ cp -Rf ../deploy/linux/* "$SERVER_FOLDER/" || fail "Could not copy binary depend
 cp -f  ../deploy/general/*.pdf "$SERVER_FOLDER/" || fail "Could not copy pdf"
 cp -Rf ../deploy/general/wallpapers "$SERVER_FOLDER/" || fail "Could not copy wallpapers"
 cp -Rf ../deploy/general/server/media "$SERVER_FOLDER/" || fail "Could not copy media"
+cp -Rf ../deploy/general/server/template "$SERVER_FOLDER/" || fail "Could not copy template"
+cp -Rf ../deploy/general/server/font "$SERVER_FOLDER/" || fail "Could not copy font"
 
 # Copy documentation
 echo Copying documentation...