diff options
| author | Thomas Dinges <blender@dingto.org> | 2010-04-14 21:15:33 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2010-04-14 21:15:33 +0400 |
| commit | 22d4b020875aae010dd9da1e139aab74a5c41ab7 (patch) | |
| tree | a3112bfe8b6d3362b70e09a40b79cedb0b3c07c7 | |
| parent | 5aed24c84ebea7f7c20e1ad3bcc7c30badeeb6ed (diff) | |
Fixing Scons compile on Windows:
*Missed PTHREAD declaration.
| -rw-r--r-- | source/blender/gpu/SConscript | 3 | ||||
| -rw-r--r-- | source/creator/SConscript | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index 98f57f336ab..4f1cdc2ce76 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -8,6 +8,9 @@ defs = [ 'GLEW_STATIC' ] incs = '../blenlib ../blenkernel ../makesdna ../include' incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern ../imbuf .' +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] + incs += ' ' + env['BF_OPENGL_INC'] env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs, libtype=['core','player'], priority=[160,110] ) diff --git a/source/creator/SConscript b/source/creator/SConscript index 8c71e0e8566..89506bdefc8 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -39,5 +39,8 @@ if env['WITH_BF_FHS']: # /usr -> /usr/share/blender/2.5 if env['BF_BUILDINFO']: defs.append('BUILD_DATE') defs.append('NAN_BUILDINFO') + +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] env.BlenderLib ( libname = 'bf_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 0 ) |