Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Enable /WX in blenkernel

Browse Source 
Silence warnings
This commit is contained in:
Nathan Letwory
2010-10-21 07:39:18 +00:00
parent 0ec320783e
commit 107b274fb8
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/SConscript
View File

@@ -60,6 +60,6 @@ if env['BF_GHOST_DEBUG']:
incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC']
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
incs = env['BF_WINTAB_INC'] + ' ' + incs incs = env['BF_WINTAB_INC'] + ' ' + incs
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=['/WX'] )
else: else:
env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] )

2
source/blender/blenkernel/BKE_idprop.h
View File

@@ -33,7 +33,7 @@
struct IDProperty; struct IDProperty;
struct ID; struct ID;
typedef union { typedef union IDPropertyTemplate {
int i; int i;
float f; float f;
double d; double d;

3
source/blender/blenkernel/SConscript
View File

@@ -89,4 +89,7 @@ if env['WITH_BF_LZMA']:
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC'] 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'] )
else:
env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25] ) env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25] )

6
source/blender/blenkernel/intern/writeffmpeg.c
View File

@@ -1059,14 +1059,14 @@ IDProperty *ffmpeg_property_add(RenderData *rd, char * type, int opt_index, int
int idp_type; int idp_type;
char name[256]; char name[256];
val.i = 0;
avcodec_get_context_defaults(&c); avcodec_get_context_defaults(&c);
o = c.av_class->option + opt_index; o = c.av_class->option + opt_index;
parent = c.av_class->option + parent_index; parent = c.av_class->option + parent_index;
if (!rd->ffcodecdata.properties) { if (!rd->ffcodecdata.properties) {
IDPropertyTemplate val;
rd->ffcodecdata.properties rd->ffcodecdata.properties
= IDP_New(IDP_GROUP, val, "ffmpeg"); = IDP_New(IDP_GROUP, val, "ffmpeg");
} }
@@ -1075,8 +1075,6 @@ IDProperty *ffmpeg_property_add(RenderData *rd, char * type, int opt_index, int
rd->ffcodecdata.properties, (char*) type); rd->ffcodecdata.properties, (char*) type);
if (!group) { if (!group) {
IDPropertyTemplate val;
group = IDP_New(IDP_GROUP, val, (char*) type); group = IDP_New(IDP_GROUP, val, (char*) type);
IDP_AddToGroup(rd->ffcodecdata.properties, group); IDP_AddToGroup(rd->ffcodecdata.properties, group);
} }

2
source/blender/blenlib/BLI_winstuff.h
View File

@@ -35,7 +35,7 @@
#ifdef _WIN32 #ifdef _WIN32
#ifndef FREE_WINDOWS #ifndef FREE_WINDOWS
#pragma warning(once: 4761 4305 4244 4018) #pragma warning(once: 4761 4305 4244)
#endif #endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN