2.5 / Nodes / SCons(mingw)

* chop the nodes library into smaller parts
  - the addition of texture tree pushed the limits for scons/mingw
  - This should still have everything compile nicely, but please,
    maintainers of other build systems should check. The only interesting
    change for them is the difference in headers.

4 files changed, 116 insertions, 113 deletions

diff --git a/source/blender/nodes/CMP_node.h b/source/blender/nodes/CMP_node.h
index 020bbdebfa2..84d311b6173 100644
--- a/source/blender/nodes/CMP_node.h
+++ b/source/blender/nodes/CMP_node.h
@@ -38,71 +38,71 @@
 
 /* ****************** types array for all composite nodes ****************** */
 
-extern bNodeType cmp_node_rlayers;
-extern bNodeType cmp_node_image;
-extern bNodeType cmp_node_texture;
-extern bNodeType cmp_node_value;
-extern bNodeType cmp_node_rgb;
-extern bNodeType cmp_node_curve_time;
+bNodeType cmp_node_rlayers;
+bNodeType cmp_node_image;
+bNodeType cmp_node_texture;
+bNodeType cmp_node_value;
+bNodeType cmp_node_rgb;
+bNodeType cmp_node_curve_time;
 
-extern bNodeType cmp_node_composite;
-extern bNodeType cmp_node_viewer;
-extern bNodeType cmp_node_splitviewer;
-extern bNodeType cmp_node_output_file;
+bNodeType cmp_node_composite;
+bNodeType cmp_node_viewer;
+bNodeType cmp_node_splitviewer;
+bNodeType cmp_node_output_file;
 
-extern bNodeType cmp_node_curve_rgb;
-extern bNodeType cmp_node_mix_rgb;
-extern bNodeType cmp_node_hue_sat;
-extern bNodeType cmp_node_brightcontrast;
-extern bNodeType cmp_node_gamma;
-extern bNodeType cmp_node_invert;
-extern bNodeType cmp_node_alphaover;
-extern bNodeType cmp_node_zcombine;
+bNodeType cmp_node_curve_rgb;
+bNodeType cmp_node_mix_rgb;
+bNodeType cmp_node_hue_sat;
+bNodeType cmp_node_brightcontrast;
+bNodeType cmp_node_gamma;
+bNodeType cmp_node_invert;
+bNodeType cmp_node_alphaover;
+bNodeType cmp_node_zcombine;
 
-extern bNodeType cmp_node_normal;
-extern bNodeType cmp_node_curve_vec;
-extern bNodeType cmp_node_map_value;
-extern bNodeType cmp_node_normalize;
+bNodeType cmp_node_normal;
+bNodeType cmp_node_curve_vec;
+bNodeType cmp_node_map_value;
+bNodeType cmp_node_normalize;
 
-extern bNodeType cmp_node_filter;
-extern bNodeType cmp_node_blur;
-extern bNodeType cmp_node_dblur;
-extern bNodeType cmp_node_bilateralblur;
-extern bNodeType cmp_node_vecblur;
-extern bNodeType cmp_node_dilateerode;
-extern bNodeType cmp_node_defocus;
+bNodeType cmp_node_filter;
+bNodeType cmp_node_blur;
+bNodeType cmp_node_dblur;
+bNodeType cmp_node_bilateralblur;
+bNodeType cmp_node_vecblur;
+bNodeType cmp_node_dilateerode;
+bNodeType cmp_node_defocus;
 
-extern bNodeType cmp_node_valtorgb;
-extern bNodeType cmp_node_rgbtobw;	
-extern bNodeType cmp_node_setalpha;
-extern bNodeType cmp_node_idmask;
-extern bNodeType cmp_node_math;
-extern bNodeType cmp_node_seprgba;
-extern bNodeType cmp_node_combrgba;
-extern bNodeType cmp_node_sephsva;
-extern bNodeType cmp_node_combhsva;
-extern bNodeType cmp_node_sepyuva;
-extern bNodeType cmp_node_combyuva;
-extern bNodeType cmp_node_sepycca;
-extern bNodeType cmp_node_combycca; 
-extern bNodeType cmp_node_premulkey;
+bNodeType cmp_node_valtorgb;
+bNodeType cmp_node_rgbtobw;	
+bNodeType cmp_node_setalpha;
+bNodeType cmp_node_idmask;
+bNodeType cmp_node_math;
+bNodeType cmp_node_seprgba;
+bNodeType cmp_node_combrgba;
+bNodeType cmp_node_sephsva;
+bNodeType cmp_node_combhsva;
+bNodeType cmp_node_sepyuva;
+bNodeType cmp_node_combyuva;
+bNodeType cmp_node_sepycca;
+bNodeType cmp_node_combycca; 
+bNodeType cmp_node_premulkey;
 
-extern bNodeType cmp_node_diff_matte;
-extern bNodeType cmp_node_chroma;
-extern bNodeType cmp_node_channel_matte;
-extern bNodeType cmp_node_color_spill;
-extern bNodeType cmp_node_luma_matte; 
+bNodeType cmp_node_diff_matte;
+bNodeType cmp_node_chroma;
+bNodeType cmp_node_channel_matte;
+bNodeType cmp_node_color_spill;
+bNodeType cmp_node_luma_matte; 
 
-extern bNodeType cmp_node_translate;
-extern bNodeType cmp_node_rotate;
-extern bNodeType cmp_node_scale;
-extern bNodeType cmp_node_flip;
-extern bNodeType cmp_node_crop;
-extern bNodeType cmp_node_displace;
-extern bNodeType cmp_node_mapuv;
+bNodeType cmp_node_translate;
+bNodeType cmp_node_rotate;
+bNodeType cmp_node_scale;
+bNodeType cmp_node_flip;
+bNodeType cmp_node_crop;
+bNodeType cmp_node_displace;
+bNodeType cmp_node_mapuv;
 
-extern bNodeType cmp_node_glare;
-extern bNodeType cmp_node_tonemap;
-extern bNodeType cmp_node_lensdist;
+bNodeType cmp_node_glare;
+bNodeType cmp_node_tonemap;
+bNodeType cmp_node_lensdist;
 
 #endif
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript
index c7be20e3ec0..06e3a2606f0 100644
--- a/source/blender/nodes/SConscript
+++ b/source/blender/nodes/SConscript
@@ -2,9 +2,9 @@
 Import ('env')
 
 sources = env.Glob('intern/*.c')
-sources += env.Glob('intern/CMP_nodes/*.c')
-sources += env.Glob('intern/SHD_nodes/*.c')
-sources += env.Glob('intern/TEX_nodes/*.c')
+cmpsources = env.Glob('intern/CMP_nodes/*.c')
+shdsources = env.Glob('intern/SHD_nodes/*.c')
+texsources = env.Glob('intern/TEX_nodes/*.c')
 
 incs = '. ./intern '
 incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna'
@@ -41,4 +41,7 @@ if env['WITH_BF_QUICKTIME']:
 
 defs += ' WITH_CCGSUBSURF '
 
-env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] )
+env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [190] )
+env.BlenderLib ( libname = 'bf_cmpnodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] )
+env.BlenderLib ( libname = 'bf_shdnodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] )
+env.BlenderLib ( libname = 'bf_texnodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] )
diff --git a/source/blender/nodes/SHD_node.h b/source/blender/nodes/SHD_node.h
index d75d7c9f568..10af3f162d6 100644
--- a/source/blender/nodes/SHD_node.h
+++ b/source/blender/nodes/SHD_node.h
@@ -39,29 +39,29 @@
 /* the type definitions array */
 /* ****************** types array for all shaders ****************** */
 
-extern bNodeType sh_node_output;
-extern bNodeType sh_node_material;
-extern bNodeType sh_node_camera;
-extern bNodeType sh_node_value;
-extern bNodeType sh_node_rgb;
-extern bNodeType sh_node_mix_rgb;
-extern bNodeType sh_node_valtorgb;
-extern bNodeType sh_node_rgbtobw;
-extern bNodeType sh_node_texture;
-extern bNodeType sh_node_normal;
-extern bNodeType sh_node_geom;
-extern bNodeType sh_node_mapping;
-extern bNodeType sh_node_curve_vec;
-extern bNodeType sh_node_curve_rgb;
-extern bNodeType sh_node_math;
-extern bNodeType sh_node_vect_math;
-extern bNodeType sh_node_squeeze;
-extern bNodeType node_dynamic_typeinfo;
-extern bNodeType sh_node_material_ext;
-extern bNodeType sh_node_invert;
-extern bNodeType sh_node_seprgb;
-extern bNodeType sh_node_combrgb;
-extern bNodeType sh_node_hue_sat;
+bNodeType sh_node_output;
+bNodeType sh_node_material;
+bNodeType sh_node_camera;
+bNodeType sh_node_value;
+bNodeType sh_node_rgb;
+bNodeType sh_node_mix_rgb;
+bNodeType sh_node_valtorgb;
+bNodeType sh_node_rgbtobw;
+bNodeType sh_node_texture;
+bNodeType sh_node_normal;
+bNodeType sh_node_geom;
+bNodeType sh_node_mapping;
+bNodeType sh_node_curve_vec;
+bNodeType sh_node_curve_rgb;
+bNodeType sh_node_math;
+bNodeType sh_node_vect_math;
+bNodeType sh_node_squeeze;
+bNodeType node_dynamic_typeinfo;
+bNodeType sh_node_material_ext;
+bNodeType sh_node_invert;
+bNodeType sh_node_seprgb;
+bNodeType sh_node_combrgb;
+bNodeType sh_node_hue_sat;
 
 #endif
 
diff --git a/source/blender/nodes/TEX_node.h b/source/blender/nodes/TEX_node.h
index 40cb65eacce..554aa2277c0 100644
--- a/source/blender/nodes/TEX_node.h
+++ b/source/blender/nodes/TEX_node.h
@@ -38,35 +38,35 @@
 
 /* ****************** types array for all texture nodes ****************** */
 
-extern bNodeType tex_node_math;
-extern bNodeType tex_node_mix_rgb;
-extern bNodeType tex_node_valtorgb;
-extern bNodeType tex_node_rgbtobw;
-extern bNodeType tex_node_output;
-extern bNodeType tex_node_viewer;
-extern bNodeType tex_node_checker;
-extern bNodeType tex_node_texture;
-extern bNodeType tex_node_bricks;
-extern bNodeType tex_node_image;
-extern bNodeType tex_node_curve_rgb;
-extern bNodeType tex_node_curve_time;
-extern bNodeType tex_node_invert;
-extern bNodeType tex_node_hue_sat;
-extern bNodeType tex_node_coord;
-extern bNodeType tex_node_distance;
+bNodeType tex_node_math;
+bNodeType tex_node_mix_rgb;
+bNodeType tex_node_valtorgb;
+bNodeType tex_node_rgbtobw;
+bNodeType tex_node_output;
+bNodeType tex_node_viewer;
+bNodeType tex_node_checker;
+bNodeType tex_node_texture;
+bNodeType tex_node_bricks;
+bNodeType tex_node_image;
+bNodeType tex_node_curve_rgb;
+bNodeType tex_node_curve_time;
+bNodeType tex_node_invert;
+bNodeType tex_node_hue_sat;
+bNodeType tex_node_coord;
+bNodeType tex_node_distance;
 
-extern bNodeType tex_node_rotate;
-extern bNodeType tex_node_translate;
+bNodeType tex_node_rotate;
+bNodeType tex_node_translate;
 
-extern bNodeType tex_node_proc_voronoi;
-extern bNodeType tex_node_proc_blend;
-extern bNodeType tex_node_proc_magic;
-extern bNodeType tex_node_proc_marble;
-extern bNodeType tex_node_proc_clouds;
-extern bNodeType tex_node_proc_wood;
-extern bNodeType tex_node_proc_musgrave;
-extern bNodeType tex_node_proc_noise;
-extern bNodeType tex_node_proc_stucci;
-extern bNodeType tex_node_proc_distnoise;
+bNodeType tex_node_proc_voronoi;
+bNodeType tex_node_proc_blend;
+bNodeType tex_node_proc_magic;
+bNodeType tex_node_proc_marble;
+bNodeType tex_node_proc_clouds;
+bNodeType tex_node_proc_wood;
+bNodeType tex_node_proc_musgrave;
+bNodeType tex_node_proc_noise;
+bNodeType tex_node_proc_stucci;
+bNodeType tex_node_proc_distnoise;
 
 #endif