diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-21 11:39:18 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-21 11:39:18 +0400 |
| commit | 107b274fb8e43246054348733ff32bb38f742eba (patch) | |
| tree | d506b35d9621a0cd089efc1b1e30a9bcd32c6761 | |
| parent | 0ec320783ec5867cc9c29fff9a09a4d8f1b7fbdf (diff) | |
Enable /WX in blenkernel
Silence warnings
| -rw-r--r-- | intern/ghost/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_idprop.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 6 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_winstuff.h | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 5be8503b2b0..de8dd51d2dc 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -60,6 +60,6 @@ if env['BF_GHOST_DEBUG']: 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'): 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: env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 0e0d76f4284..eb33479cdb4 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -33,7 +33,7 @@ struct IDProperty; struct ID; -typedef union { +typedef union IDPropertyTemplate { int i; float f; double d; diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 954b7759b46..3793eb8cc64 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -89,4 +89,7 @@ if env['WITH_BF_LZMA']: if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] -env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25] ) +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] ) diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index aae26da02dd..30a804be637 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -1058,6 +1058,8 @@ IDProperty *ffmpeg_property_add(RenderData *rd, char * type, int opt_index, int IDPropertyTemplate val; int idp_type; char name[256]; + + val.i = 0; avcodec_get_context_defaults(&c); @@ -1065,8 +1067,6 @@ IDProperty *ffmpeg_property_add(RenderData *rd, char * type, int opt_index, int parent = c.av_class->option + parent_index; if (!rd->ffcodecdata.properties) { - IDPropertyTemplate val; - rd->ffcodecdata.properties = 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); if (!group) { - IDPropertyTemplate val; - group = IDP_New(IDP_GROUP, val, (char*) type); IDP_AddToGroup(rd->ffcodecdata.properties, group); } diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index b66790f701f..c9a85cf890e 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 4018) +#pragma warning(once: 4761 4305 4244) #endif #define WIN32_LEAN_AND_MEAN |