[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19085] trunk/blender/source/blender/nodes : SCons
joe
joeedh at gmail.com
Tue Feb 24 08:48:53 CET 2009
for mingw, you might want to look at feeding ar a list of object files
through a text file, rather then using the command line (details in
the man page, iirc). since putting the object files into the lib
often seems to be where the problem is.
joe
On Sun, Feb 22, 2009 at 1:44 PM, Nathan Letwory <jesterking at letwory.net> wrote:
> Revision: 19085
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19085
> Author: jesterking
> Date: 2009-02-22 21:44:36 +0100 (Sun, 22 Feb 2009)
>
> Log Message:
> -----------
> SCons
> * I accidently broke the scons bit by chopping the node libs into pieces. I forgot that trunk hasn't had the nice scons cleanout I did in Blender 2.5 branch. Now everything should compile again.
> It took a while because I tried to quickly do the same cleanup, but src/ is just not cooperating, neither is stock mingw (no @commands.txt tempfilemunge goodies)
>
> Modified Paths:
> --------------
> trunk/blender/source/blender/nodes/CMP_node.h
> trunk/blender/source/blender/nodes/SConscript
> trunk/blender/source/blender/nodes/SHD_node.h
> trunk/blender/source/blender/nodes/TEX_node.h
>
> Modified: trunk/blender/source/blender/nodes/CMP_node.h
> ===================================================================
> --- trunk/blender/source/blender/nodes/CMP_node.h 2009-02-22 19:37:30 UTC (rev 19084)
> +++ trunk/blender/source/blender/nodes/CMP_node.h 2009-02-22 20:44:36 UTC (rev 19085)
> @@ -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
>
> Modified: trunk/blender/source/blender/nodes/SConscript
> ===================================================================
> --- trunk/blender/source/blender/nodes/SConscript 2009-02-22 19:37:30 UTC (rev 19084)
> +++ trunk/blender/source/blender/nodes/SConscript 2009-02-22 20:44:36 UTC (rev 19085)
> @@ -39,7 +39,7 @@
> defs += ' WITH_QUICKTIME'
> incs += ' ' + env['BF_QUICKTIME_INC']
>
> -env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [190] )
> -env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] )
> -env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] )
> -env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] )
> +env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['intern', 'core', 'player'], priority = [200, 200, 300] )
> +env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = Split(defs), libtype=['intern', 'core'], priority = [200, 175] )
> +env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = Split(defs), libtype=['intern', 'core'], priority = [200, 175] )
> +env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = Split(defs), libtype=['intern', 'core'], priority = [200, 175] )
>
> Modified: trunk/blender/source/blender/nodes/SHD_node.h
> ===================================================================
> --- trunk/blender/source/blender/nodes/SHD_node.h 2009-02-22 19:37:30 UTC (rev 19084)
> +++ trunk/blender/source/blender/nodes/SHD_node.h 2009-02-22 20:44:36 UTC (rev 19085)
> @@ -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
>
>
> Modified: trunk/blender/source/blender/nodes/TEX_node.h
> ===================================================================
> --- trunk/blender/source/blender/nodes/TEX_node.h 2009-02-22 19:37:30 UTC (rev 19084)
> +++ trunk/blender/source/blender/nodes/TEX_node.h 2009-02-22 20:44:36 UTC (rev 19085)
> @@ -38,40 +38,40 @@
>
> /* ****************** 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_valtonor;
> -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_valtonor;
> +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;
> -extern bNodeType tex_node_scale;
> +bNodeType tex_node_rotate;
> +bNodeType tex_node_translate;
> +bNodeType tex_node_scale;
>
> -extern bNodeType tex_node_compose;
> -extern bNodeType tex_node_decompose;
> +bNodeType tex_node_compose;
> +bNodeType tex_node_decompose;
>
> -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
>
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
More information about the Bf-committers
mailing list