[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46690] trunk/lib/mingw64/opencollada: The first build was apparently incorrect.

[Nathan Letwory]

Revision: 46690
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46690
Author:   jesterking
Date:     2012-05-16 10:25:03 +0000 (Wed, 16 May 2012)
Log Message:
-----------
The first build was apparently incorrect. A small fix and updated libs now have mingw64 builds working correctly on export.

Thanks to Gaia-Clary for assisting in the bughunt and fix.

Modified Paths:
--------------
    trunk/lib/mingw64/opencollada/lib/libGeneratedSaxParser.a
    trunk/lib/mingw64/opencollada/lib/libMathMLSolver.a
    trunk/lib/mingw64/opencollada/lib/libOpenCOLLADABaseUtils.a
    trunk/lib/mingw64/opencollada/lib/libOpenCOLLADAFramework.a
    trunk/lib/mingw64/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
    trunk/lib/mingw64/opencollada/lib/libOpenCOLLADAStreamWriter.a
    trunk/lib/mingw64/opencollada/lib/libUTF.a
    trunk/lib/mingw64/opencollada/lib/libbuffer.a
    trunk/lib/mingw64/opencollada/lib/libftoa.a
    trunk/lib/mingw64/opencollada/lib/libpcre.a
    trunk/lib/mingw64/opencollada/lib/libxml.a
    trunk/lib/mingw64/opencollada/r869_mingw64_building.patch

Modified: trunk/lib/mingw64/opencollada/lib/libGeneratedSaxParser.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libMathMLSolver.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libOpenCOLLADABaseUtils.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libOpenCOLLADAFramework.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libOpenCOLLADAStreamWriter.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libUTF.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libbuffer.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libftoa.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libpcre.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libxml.a
===================================================================
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/r869_mingw64_building.patch
===================================================================
--- trunk/lib/mingw64/opencollada/r869_mingw64_building.patch	2012-05-16 10:10:42 UTC (rev 46689)
+++ trunk/lib/mingw64/opencollada/r869_mingw64_building.patch	2012-05-16 10:25:03 UTC (rev 46690)
@@ -35,6 +35,15 @@
  #else
  #	include <tr1/unordered_map>
  #endif
+@@ -25,7 +29,7 @@
+ #   include <cstdio>  /* FILE */
+ #endif
+ 
+-#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (__STDC_VERSION__ >= 199901L)
++#if (defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(__MINGW32__)) || (__STDC_VERSION__ >= 199901L)
+ typedef int64_t __int64;
+ #endif
+ 
 Index: common/libBuffer/src/CommonFWriteBufferFlusher.cpp
 ===================================================================
 --- common/libBuffer/src/CommonFWriteBufferFlusher.cpp	(revision 869)