Revision: 56016
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56016
Author: psy-fi
Date: 2013-04-13 16:29:18 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
Fix some compilation errors for MinGW. Thanks to vildas on irc for
bringing this to attention.
Modified Paths:
--------------
trunk/blender/build_files/scons/config/win32-mingw-config.py
trunk/blender/intern/ghost/intern/GHOST_SizerWin32.h
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py
2013-04-13 16:28:39 UTC (rev 56015)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py
2013-04-13 16:29:18 UTC (rev 56016)
@@ -142,11 +142,14 @@
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver
expat pcre buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver
pcre buffer ftoa xml'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
#Cycles
-WITH_BF_CYCLES = True
+WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = False
+BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/openimageio'
Modified: trunk/blender/intern/ghost/intern/GHOST_SizerWin32.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SizerWin32.h 2013-04-13
16:28:39 UTC (rev 56015)
+++ trunk/blender/intern/ghost/intern/GHOST_SizerWin32.h 2013-04-13
16:29:18 UTC (rev 56016)
@@ -29,6 +29,8 @@
#ifndef __GHOST_SIZERWIN32_H__
#define __GHOST_SIZERWIN32_H__
+#define _WIN32_WINNT 0x501 // require Windows XP or newer
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
class GHOST_SizerWin32
{
@@ -58,4 +60,4 @@
};
-#endif /*#ifndef __GHOST_SIZERWIN32_H__*/
\ No newline at end of file
+#endif /*#ifndef __GHOST_SIZERWIN32_H__*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
