Permalink
Browse files

[WIN32] check if we are called from within the ffmpeg directory. fixe…

…d: copy dlls to the right place.
  • Loading branch information...
wsoltys committed Jan 29, 2011
1 parent 2bd0759 commit 3ca3e01a999c0f58c1aba51b8e56c8db91f1d8bd
Showing with 15 additions and 7 deletions.
  1. +15 −7 lib/ffmpeg/build_xbmc_win32.sh
@@ -1,5 +1,11 @@
#!/bin/bash
+START_PATH=`pwd`
+if [ $START_PATH != "/xbmc/lib/ffmpeg" ]
+then
+cd /xbmc/lib/ffmpeg
+fi
+
if [ -d .libs ]
then
rm -r .libs
@@ -34,15 +40,17 @@ OPTIONS="
--enable-runtime-cpudetect \
--disable-debug"
-./configure --extra-cflags="-fno-common -Iinclude/dxva2" --extra-ldflags="-L../../../../../system/players/dvdplayer" ${OPTIONS} &&
+#./configure --extra-cflags="-fno-common -Iinclude/dxva2" --extra-ldflags="-L../../../../../system/players/dvdplayer" ${OPTIONS} &&
make -j3 &&
mkdir .libs &&
cp lib*/*.dll .libs/ &&
mv .libs/swscale-0.dll .libs/swscale-0.6.1.dll &&
-cp .libs/avcodec-52.dll ../../../../../system/players/dvdplayer/ &&
-cp .libs/avformat-52.dll ../../../../../system/players/dvdplayer/ &&
-cp .libs/avutil-50.dll ../../../../../system/players/dvdplayer/ &&
-cp .libs/postproc-51.dll ../../../../../system/players/dvdplayer/ &&
-cp .libs/swscale-0.6.1.dll ../../../../../system/players/dvdplayer/ &&
-cp libavutil/avconfig.h include/libavutil/
+cp .libs/avcodec-52.dll /xbmc/system/players/dvdplayer/ &&
+cp .libs/avformat-52.dll /xbmc/system/players/dvdplayer/ &&
+cp .libs/avutil-50.dll /xbmc/system/players/dvdplayer/ &&
+cp .libs/postproc-51.dll /xbmc/system/players/dvdplayer/ &&
+cp .libs/swscale-0.6.1.dll /xbmc/system/players/dvdplayer/ &&
+cp libavutil/avconfig.h include/libavutil/
+
+cd $START_PATH

0 comments on commit 3ca3e01

Please sign in to comment.