[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26532] trunk/lib/windows/opencollada: lib /windows: fixed broken OpenCollada libs.

[Arystanbek Dyussenov]

Revision: 26532
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26532
Author:   kazanbas
Date:     2010-02-01 20:25:52 +0100 (Mon, 01 Feb 2010)

Log Message:
-----------
lib/windows: fixed broken OpenCollada libs.

They were broken because for release config, GCC flags were passed to cl by mistake. I changed the flag to /MT.

libxml linking errors were gone when I changed libxml build flag from /MD to /MT.

Updated the patch, added compile instructions for 721.

Modified Paths:
--------------
    trunk/lib/windows/opencollada/lib/GeneratedSaxParser.lib
    trunk/lib/windows/opencollada/lib/MathMLSolver.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter.lib
    trunk/lib/windows/opencollada/lib/UTF.lib
    trunk/lib/windows/opencollada/lib/buffer.lib
    trunk/lib/windows/opencollada/lib/ftoa.lib
    trunk/lib/windows/opencollada/lib/pcre.lib
    trunk/lib/windows/opencollada/lib/xml2.lib
    trunk/lib/windows/opencollada/msvc_debug_r721.patch

Added Paths:
-----------
    trunk/lib/windows/opencollada/compile_opencollada_rev721.txt

Added: trunk/lib/windows/opencollada/compile_opencollada_rev721.txt
===================================================================
--- trunk/lib/windows/opencollada/compile_opencollada_rev721.txt	                        (rev 0)
+++ trunk/lib/windows/opencollada/compile_opencollada_rev721.txt	2010-02-01 19:25:52 UTC (rev 26532)
@@ -0,0 +1,15 @@
+1. checkout collada libs rev 721
+svn checkout -r 721 http://opencollada.googlecode.com/svn/trunk/ 
+
+2. compile libxml
+* cd to opencollada\Externals\LibXML\win32
+* (for release change /MTd to /MT and set buildDebug=false in configure.js
+* run configure.js
+* run nmake /f Makefile.msvc
+* copy libxml2_a to lib/windows/opencollada/xml2_d.lib
+
+3. compile Opencollada
+* For debug: scons RELEASE=0 NOVALIDATION=1 XMLPARSER=libxml PCRENATIVE=0 SHAREDLIB=0
+* For release: scons RELEASE=1 NOVALIDATION=1 XMLPARSER=libxml PCRENATIVE=0 SHAREDLIB=0
+
+4. find the libs in the /lib/win32/x86/debug subfolders and copy them to lib/windows/opencollada

Modified: trunk/lib/windows/opencollada/lib/GeneratedSaxParser.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/MathMLSolver.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/UTF.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/buffer.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/ftoa.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/pcre.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/lib/xml2.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/opencollada/msvc_debug_r721.patch
===================================================================
--- trunk/lib/windows/opencollada/msvc_debug_r721.patch	2010-02-01 19:24:18 UTC (rev 26531)
+++ trunk/lib/windows/opencollada/msvc_debug_r721.patch	2010-02-01 19:25:52 UTC (rev 26532)
@@ -1189,7 +1189,7 @@
  Decider('MD5-timestamp')
  
  
-@@ -23,7 +24,7 @@
+@@ -23,20 +24,29 @@
  , 'libxmlnative', allowed_values=('libxml', 'expat', 'libxmlnative', 'expatnative'), ignorecase=2))
  vars.Add(BoolVariable('NOVALIDATION', 'Set to disable shema validation in sax frame work loader', 0))
  
@@ -1198,8 +1198,12 @@
  Help(vars.GenerateHelpText(env))
  
  if env['RELEASE']:
-@@ -31,12 +32,18 @@
-     env['CPPFLAGS'] = ' -O2 -DNDEBUG'
+     configurationName = 'release'
+-    env['CPPFLAGS'] = ' -O2 -DNDEBUG'
++    if sys.platform == 'win32':
++        env['CPPFLAGS'] = '/MT'
++    else:
++        env['CPPFLAGS'] = ' -O2 -DNDEBUG'
  else:
      configurationName = 'debug'
 -    env['CPPFLAGS'] = ' -O0 -g3 -ggdb3 -fno-inline'
@@ -1218,7 +1222,7 @@
  env['platformDir'] = env['PLATFORM'] + '/'
  env['architectureDir'] = platform.machine() + '/'
  env['configurationBaseName'] = env['platformDir'] + env['architectureDir'] + configurationName
-@@ -65,10 +72,10 @@
+@@ -65,10 +75,10 @@
      SConscript(['Externals/pcre/SConscript'], exports = 'env')
  
  
@@ -1233,7 +1237,7 @@
  
  SConscript(['COLLADAFramework/SConscript'], exports = 'env')
  
-@@ -76,8 +83,8 @@
+@@ -76,8 +86,8 @@
  SConscript(['COLLADASaxFrameworkLoader/SConscript'], exports = 'env')
  SConscript(['COLLADAStreamWriter/SConscript'], exports = 'env')