Add msinttypes to the dependency pack and make setup.py use it iff bu…

…ilding with MSVC.

src/setup.py

@@ -329,6 +329,10 @@ def run(self, *args, **kw):
         libfile = os.path.splitext(deffile)[0] + '.lib'
         if newer(deffile, libfile):
           msvc.spawn([msvc.lib, '/nologo', '/machine:x86', '/out:'+libfile, '/def:'+deffile])
+
+      # Also add the directory containing the msinttypes headers to the include path.
+      self.include_dirs.append(os.path.join('..', 'win32', 'deps', 'include', 'msinttypes'))
+
     return _build_ext.run(self, *args, **kw)
 
 # Add the common arguments to setup().

win32/makedeps-cross.sh

@@ -277,6 +277,16 @@ if test ! -f "$PREFIX"/build-stamps/ffmpeg; then
   $RM_RF ffmpeg
 fi
 
+# msinttypes
+# MSVC needs these to compile stuff that uses ffmpeg. Since they intentionally
+# do not work with gcc, we install them to a subdirectory of deps/include
+# and feed MSVC an appropriate include_dir option in setup.py.
+if test ! -f "$PREFIX"/build-stamps/msinttypes; then
+  download http://msinttypes.googlecode.com/files/msinttypes-r26.zip
+  unzip -od deps/include/msinttypes msinttypes-r26.zip stdint.h inttypes.h
+  touch "$PREFIX"/build-stamps/msinttypes
+fi
+
 echo "All dependencies done."
 
 echo -n "Creating .def files... "