projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes in the trunk up to revision 46045.
[blender-staging.git]
/
source
/
blender
/
windowmanager
/
SConscript
diff --git
a/source/blender/windowmanager/SConscript
b/source/blender/windowmanager/SConscript
index efd404c76a8c8b989a2f5db8796352c6baf835c4..650264607401956cc25dfc18b504bf130d007f54 100644
(file)
--- a/
source/blender/windowmanager/SConscript
+++ b/
source/blender/windowmanager/SConscript
@@
-31,7
+31,7
@@
if env['OURPLATFORM'] == 'linux':
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'
, 'win64-mingw'
):
incs += ' ' + env['BF_PTHREADS_INC']
incs += ' ../../intern/utfconv'
incs += ' ' + env['BF_PTHREADS_INC']
incs += ' ../../intern/utfconv'