[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32627] trunk/blender: Enable / WX in blenkernel

[Nathan Letwory]

Revision: 32627
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32627
Author:   jesterking
Date:     2010-10-21 09:39:18 +0200 (Thu, 21 Oct 2010)

Log Message:
-----------
Enable /WX in blenkernel
Silence warnings

Modified Paths:
--------------
    trunk/blender/intern/ghost/SConscript
    trunk/blender/source/blender/blenkernel/BKE_idprop.h
    trunk/blender/source/blender/blenkernel/SConscript
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/blenlib/BLI_winstuff.h

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2010-10-21 07:38:09 UTC (rev 32626)
+++ trunk/blender/intern/ghost/SConscript	2010-10-21 07:39:18 UTC (rev 32627)
@@ -60,6 +60,6 @@
 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] ) 

Modified: trunk/blender/source/blender/blenkernel/BKE_idprop.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_idprop.h	2010-10-21 07:38:09 UTC (rev 32626)
+++ trunk/blender/source/blender/blenkernel/BKE_idprop.h	2010-10-21 07:39:18 UTC (rev 32627)
@@ -33,7 +33,7 @@
 struct IDProperty;
 struct ID;
 
-typedef union {
+typedef union IDPropertyTemplate {
 	int i;
 	float f;
 	double d;

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2010-10-21 07:38:09 UTC (rev 32626)
+++ trunk/blender/source/blender/blenkernel/SConscript	2010-10-21 07:39:18 UTC (rev 32627)
@@ -89,4 +89,7 @@
 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] )

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2010-10-21 07:38:09 UTC (rev 32626)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2010-10-21 07:39:18 UTC (rev 32627)
@@ -1058,6 +1058,8 @@
 	IDPropertyTemplate val;
 	int idp_type;
 	char name[256];
+	
+	val.i = 0;
 
 	avcodec_get_context_defaults(&c);
 
@@ -1065,8 +1067,6 @@
 	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 @@
 		rd->ffcodecdata.properties, (char*) type);
 	
 	if (!group) {
-		IDPropertyTemplate val;
-		
 		group = IDP_New(IDP_GROUP, val, (char*) type); 
 		IDP_AddToGroup(rd->ffcodecdata.properties, group);
 	}

Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_winstuff.h	2010-10-21 07:38:09 UTC (rev 32626)
+++ trunk/blender/source/blender/blenlib/BLI_winstuff.h	2010-10-21 07:39:18 UTC (rev 32627)
@@ -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