diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-27 03:32:59 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-27 03:32:59 +0400 |
| commit | f875777212efb7e1a59f8ccf2e76d50898d605e4 (patch) | |
| tree | f20357e281ef4f4eeb39c52958e20bf6b9caabda /source | |
| parent | e3f8bcbe88543244ae0d06c53bb5f5f18fed03cb (diff) | |
Change /WX away for now, some odd thing going on between cloned environments. Need to check after release.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_winstuff.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 3793eb8cc64..e8919a1008a 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -90,6 +90,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): 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] ) diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index c9a85cf890e..b66790f701f 100644 --- a/source/blender/blenlib/BLI_winstuff.h +++ b/source/blender/blenlib/BLI_winstuff.h @@ -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 diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index ecee3f94796..702955980fd 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -6,7 +6,7 @@ def normpath(path): return os.path.abspath(os.path.normpath(path)) Import ('env') -cflags = ['-Wall'] +cflags = [] #['-Wall'] defines = [] root_build_dir=normpath(env['BF_BUILDDIR']) |