diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2013-04-13 20:29:18 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2013-04-13 20:29:18 +0400 |
| commit | 15f3bbfe9e09ce1e638a3a857270c9da8f5e72c4 (patch) | |
| tree | f46ea7a493e34e64d60ff670eac62efd6accfa36 | |
| parent | 649b92e6886965153abcc4311a93d7ed876a4c7a (diff) | |
Fix some compilation errors for MinGW. Thanks to vildas on irc for
bringing this to attention.
| -rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 7 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SizerWin32.h | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index 507768c4207..0544ba775ce 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -142,11 +142,14 @@ BF_COLLADA_LIB = 'bf_collada' 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' diff --git a/intern/ghost/intern/GHOST_SizerWin32.h b/intern/ghost/intern/GHOST_SizerWin32.h index f7d11e78ad7..f3e3d1173ed 100644 --- a/intern/ghost/intern/GHOST_SizerWin32.h +++ b/intern/ghost/intern/GHOST_SizerWin32.h @@ -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 @@ class GHOST_SizerWin32 }; -#endif /*#ifndef __GHOST_SIZERWIN32_H__*/
\ No newline at end of file +#endif /*#ifndef __GHOST_SIZERWIN32_H__*/ |