Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-18 17:19:16 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-18 17:19:16 +0400
commit484d765bd49e0b7a3370280f5f3b9dac89e5f699 (patch)
tree6acf41f68cef0be38aedf2e2240258219dd79b71 /intern/cycles/SConscript
parent5fc1d9205afc899aa7a3e6d6cffe3ed9deb88eb7 (diff)
Cycles: attempt to fix internal compile error with some visual studio builds
Diffstat (limited to 'intern/cycles/SConscript')
-rw-r--r--intern/cycles/SConscript9
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 43f838157b9..57f44ae9d52 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -79,11 +79,12 @@ if env['WITH_BF_RAYOPTIMIZATION']:
sse3_cxxflags = Split(env['CXXFLAGS'])
if env['OURPLATFORM'] == 'win32-vc':
- sse2_cxxflags.append('/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
- sse3_cxxflags.append('/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
+ sse2_cxxflags.append('/arch:SSE /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc /Ox /Gs-'.split())
+ # there is no /arch:SSE3, but intrinsics are available anyway
+ sse3_cxxflags.append('/arch:SSE /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc /Ox /Gs-'.split())
elif env['OURPLATFORM'] == 'win64-vc':
- sse2_cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
- sse3_cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
+ sse2_cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc /Ox /Gs-'.split())
+ sse3_cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc /Ox /Gs-'.split())
else:
sse2_cxxflags.append('-ffast-math -msse -msse2 -mfpmath=sse'.split())
sse3_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse'.split())