From: HellGore Date: Fri, 19 Aug 2016 13:58:06 +0000 (+0200) Subject: Merge pull request #462 from pkeuter/patch-1 X-Git-Tag: 2.1.0_Beta1~65^2 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f94590ebd2307d5777a999ee9088c7f68d5d6e61;hp=dd695abcd8b29c620842f8e463c13008a0ef9deb;p=casparcg Merge pull request #462 from pkeuter/patch-1 Fix CPU hogging on EOF in ffmpeg producer. --- diff --git a/build-scripts/build-linux.sh b/build-scripts/build-linux.sh index bc75a81a6..0ee553c1a 100755 --- a/build-scripts/build-linux.sh +++ b/build-scripts/build-linux.sh @@ -44,6 +44,7 @@ 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" diff --git a/build-scripts/build-windows.bat b/build-scripts/build-windows.bat index 0ab6e95b8..1274a8770 100644 --- a/build-scripts/build-windows.bat +++ b/build-scripts/build-windows.bat @@ -48,6 +48,7 @@ copy shell\RelWithDebInfo\casparcg.pdb "%SERVER_FOLDER%\Server" || goto :error copy shell\RelWithDebInfo\libcef.dll.pdb "%SERVER_FOLDER%\Server" || goto :error copy shell\casparcg.config "%SERVER_FOLDER%\Server" || goto :error copy shell\*.ttf "%SERVER_FOLDER%\Server" || goto :error +copy shell\*.pak "%SERVER_FOLDER%\Server" || goto :error xcopy shell\locales "%SERVER_FOLDER%\Server\locales" /E /I /Y || goto :error :: Copy documentation