[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50134] trunk/blender/source/blender/imbuf /intern/dds: Fix compilation on MinGW after recent utf 16 fixes ( possibly win32 too).

[Antony Riakiotakis]

Revision: 50134
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50134
Author:   psy-fi
Date:     2012-08-22 19:01:09 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Fix compilation on MinGW after recent utf 16 fixes (possibly win32 too). gcc ostream does not support wchar_t, I hope it works as expected with unicode filenames.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
    trunk/blender/source/blender/imbuf/intern/dds/SConscript
    trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp

Modified: trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt	2012-08-22 17:23:02 UTC (rev 50133)
+++ trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt	2012-08-22 19:01:09 UTC (rev 50134)
@@ -31,6 +31,7 @@
 	../../../blenlib
 	../../../makesdna
 	../../../../../intern/guardedalloc
+	../../../../../intern/utfconv
 )
 
 set(INC_SYS

Modified: trunk/blender/source/blender/imbuf/intern/dds/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/SConscript	2012-08-22 17:23:02 UTC (rev 50133)
+++ trunk/blender/source/blender/imbuf/intern/dds/SConscript	2012-08-22 19:01:09 UTC (rev 50134)
@@ -11,7 +11,8 @@
     '../../../blenkernel',
     '../../../blenlib',
     'intern/include',
-    '#/intern/guardedalloc']
+    '#/intern/guardedalloc',
+    '#/intern/utfconv']
 
 
 defs = ['WITH_DDS']

Modified: trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp	2012-08-22 17:23:02 UTC (rev 50133)
+++ trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp	2012-08-22 19:01:09 UTC (rev 50134)
@@ -32,7 +32,7 @@
 #include <stdio.h> // printf
 #include <fstream>
 
-#ifdef WIN32
+#if defined (WIN32) && !defined(FREE_WINDOWS)
 #include "utfconv.h"
 #endif
 
@@ -54,7 +54,7 @@
 	/* open file for writing */
 	std::ofstream fildes;
 
-#ifdef WIN32
+#if defined (WIN32) && !defined(FREE_WINDOWS)
 	wchar_t *wname = alloc_utf16_from_8(name, 0);
 	fildes.open(wname);
 	free(wname);