move MSVC compatibility headers stdint.h and inttypes.h

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2798 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 9 insertions, 2 deletions

diff --git a/mediaplugin/dists/buildbot/win32-delphi-build.sh b/mediaplugin/dists/buildbot/win32-delphi-build.sh
index 6a045bd1..3474d7f8 100755
--- a/mediaplugin/dists/buildbot/win32-delphi-build.sh
+++ b/mediaplugin/dists/buildbot/win32-delphi-build.sh
@@ -8,6 +8,13 @@ if ([ "$GREP_DIR" != "/bin/grep.exe" ] && [ "$GREP_DIR" != "/usr/bin/grep.exe" ]
 fi
 cd src/mediaplugins/ffmpeg
 ./autogen.sh
-FFMPEG_LIBDIR="libffmpeg"
-./configure ffmpeg_CFLAGS="-I${FFMPEG_LIBDIR}/include" ffmpeg_LIBS="-L${FFMPEG_LIBDIR}/lib -lavcodec -lavformat -lavutil" libswscale_CFLAGS="-I${FFMPEG_LIBDIR}/include" libswscale_LIBS="-L${FFMPEG_LIBDIR}/lib -lswscale"
+FFMPEG_DIR="libffmpeg"
+FFMPEG_LIB="${FFMPEG_DIR}/lib"
+FFMPEG_INCLUDE="${FFMPEG_DIR}/include"
+# remove MSVC compatibility files inttypes.h and stdint.h
+if [ -e "${FFMPEG_INCLUDE}/inttypes.h" ]; then
+  mkdir -p "${FFMPEG_INCLUDE}/intheader"
+  mv -f "${FFMPEG_INCLUDE}/inttypes.h" "${FFMPEG_INCLUDE}/stdint.h" "${FFMPEG_INCLUDE}/intheader"
+fi
+./configure ffmpeg_CFLAGS="-I${FFMPEG_INCLUDE}" ffmpeg_LIBS="-L${FFMPEG_LIB} -lavcodec -lavformat -lavutil" libswscale_CFLAGS="-I${FFMPEG_INCLUDE}" libswscale_LIBS="-L${FFMPEG_LIB} -lswscale"
 make compile