From: walterav1984 Date: Tue, 31 Jan 2017 20:53:38 +0000 (+0100) Subject: Update build.sh X-Git-Tag: 2.1.0_Beta2~105^2 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ea1411b06bec614d4b10af43eeafbe8b4667bf9a;p=casparcg Update build.sh --- diff --git a/dependencies64/ffmpeg/ffmpeg-build-linux/build.sh b/dependencies64/ffmpeg/ffmpeg-build-linux/build.sh index f27814926..a4a69435d 100755 --- a/dependencies64/ffmpeg/ffmpeg-build-linux/build.sh +++ b/dependencies64/ffmpeg/ffmpeg-build-linux/build.sh @@ -451,8 +451,9 @@ make -j $jval && make install #dirty hack #replace shipped ffmpeg linux libs with compiled ones from here! -cd $BUILD_DIR -mv ../../bin/linux ../../bin/linux-shipped -cp -r ../target/lib ../../bin/linux +#also check modules/ffmpeg/CMakeLists.txt for lib version/name changes! +#cd $BUILD_DIR +#mv ../../bin/linux ../../bin/linux-shipped +#cp -r ../target/lib ../../bin/linux #some ffmpeg libs are build in a different shared target folder -cp ../target/usr/local/lib/* ../../bin/linux/ +#cp ../target/usr/local/lib/* ../../bin/linux/