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:
authorJoshua Leung <aligorith@gmail.com>2009-10-06 14:23:25 +0400
committerJoshua Leung <aligorith@gmail.com>2009-10-06 14:23:25 +0400
commitc93127d06fd7fc0219ec103bfab94b11cc13f9e0 (patch)
treeed61ab71c15f5e585434dcb784f6fd1f8274ef2b /source/blender/render/SConscript
parent58557ea737713dc654f4f313530b1acf920763c6 (diff)
Some more compile fixes for jaguarandi's commit, this time for msvc+scons
* Replaced ... = {}; with ... = {0}; * Solved problem with logf(), where msvc couldn't figure out which version of log() to call (solved by casting the int argument to a float, but could also have been to double)... * The cflags and cxxflags for scons when compiling the rendering module were only valid for gcc compiles. These will still need to get added for msvc sometime, but for now, there are no more warnings about unknown options...
Diffstat (limited to 'source/blender/render/SConscript')
-rw-r--r--source/blender/render/SConscript10
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index 88942ced027..17c20e8807a 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -1,8 +1,14 @@
#!/usr/bin/python
Import ('env')
-cflags = ['-O2','-msse2','-mfpmath=sse']
-cxxflags = ['-O2','-msse2','-mfpmath=sse']
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ # FIXME: need to set the appropriate flags for msvc, otherwise we get warnings
+ cflags = []
+ cxxflags = []
+else:
+ cflags = ['-O2','-msse2','-mfpmath=sse']
+ cxxflags = ['-O2','-msse2','-mfpmath=sse']
+
sources = env.Glob('intern/source/*.c')
raysources = env.Glob('intern/raytrace/*.cpp')