[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32724] trunk/blender: Change / WX away for now, some odd thing going on between cloned environments.

[Nathan Letwory]

Revision: 32724
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32724
Author:   jesterking
Date:     2010-10-27 01:32:59 +0200 (Wed, 27 Oct 2010)

Log Message:
-----------
Change /WX away for now, some odd thing going on between cloned environments. Need to check after release.

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/intern/ghost/SConscript
    trunk/blender/source/blender/blenkernel/SConscript
    trunk/blender/source/blender/blenlib/BLI_winstuff.h
    trunk/blender/source/blender/makesrna/intern/SConscript

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2010-10-26 23:28:10 UTC (rev 32723)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2010-10-26 23:32:59 UTC (rev 32724)
@@ -170,7 +170,7 @@
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
 CXXFLAGS = ['/EHsc']
 BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
 

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2010-10-26 23:28:10 UTC (rev 32723)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2010-10-26 23:32:59 UTC (rev 32724)
@@ -166,7 +166,7 @@
 CXX = 'cl.exe'
 
 CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/we4013', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
 BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
 

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2010-10-26 23:28:10 UTC (rev 32723)
+++ trunk/blender/intern/ghost/SConscript	2010-10-26 23:32:59 UTC (rev 32724)
@@ -62,6 +62,6 @@
     incs = env['BF_WINTAB_INC'] + ' ' + incs
 
 if window_system in ('win32-vc', 'win64-vc'):
-    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compileflags=['/WX'] ) 
+    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') ) 
 else:
     env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) 

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2010-10-26 23:28:10 UTC (rev 32723)
+++ trunk/blender/source/blender/blenkernel/SConscript	2010-10-26 23:32:59 UTC (rev 32724)
@@ -90,6 +90,6 @@
     incs += ' ' + env['BF_PTHREADS_INC']
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25], cc_compileflags = ['/WX'] )
+    env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25]) #, cc_compileflags = env['CCFLAGS'].append('/WX') )
 else:
     env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25] )

Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_winstuff.h	2010-10-26 23:28:10 UTC (rev 32723)
+++ trunk/blender/source/blender/blenlib/BLI_winstuff.h	2010-10-26 23:32:59 UTC (rev 32724)
@@ -35,7 +35,7 @@
 #ifdef _WIN32
 
 #ifndef FREE_WINDOWS
-#pragma warning(once: 4761 4305 4244)
+#pragma warning(once: 4761 4305 4244 4018)
 #endif
 
 #define WIN32_LEAN_AND_MEAN

Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript	2010-10-26 23:28:10 UTC (rev 32723)
+++ trunk/blender/source/blender/makesrna/intern/SConscript	2010-10-26 23:32:59 UTC (rev 32724)
@@ -6,7 +6,7 @@
     return os.path.abspath(os.path.normpath(path))
 
 Import ('env')
-cflags = ['-Wall']
+cflags = [] #['-Wall']
 defines = []
 root_build_dir=normpath(env['BF_BUILDDIR'])