diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rwxr-xr-x | source/blender/freestyle/intern/image/ImagePyramid.cpp | 6 | ||||
| -rwxr-xr-x | source/blender/freestyle/intern/system/PseudoNoise.cpp | 2 | ||||
| -rwxr-xr-x | source/blender/freestyle/intern/system/StringUtils.cpp | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/render/SConscript | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index 341638c0e0c..69908045173 100644 --- a/SConstruct +++ b/SConstruct @@ -492,7 +492,7 @@ if env['WITH_BF_PLAYER']: Depends(blenderplayer,installtarget) if not env['WITH_BF_GAMEENGINE']: - blendernogame = env.Alias('blendernogame', B.program_list) + blendernogame = env.Alias('blendernogame', B.game) Depends(blendernogame,installtarget) Depends(nsiscmd, allinstall) diff --git a/source/blender/freestyle/intern/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp index e3f84983055..542ab7917e3 100755 --- a/source/blender/freestyle/intern/image/ImagePyramid.cpp +++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp @@ -58,9 +58,9 @@ float ImagePyramid::pixel(int x, int y, int level){ if(0 == level){ return img->pixel(x,y); } - uint i = 1<<level; - uint sx = x>>level; - uint sy = y>>level; + unsigned int i = 1<<level; + unsigned int sx = x>>level; + unsigned int sy = y>>level; if(sx >= img->width()) sx = img->width()-1; if(sy >= img->height()) diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp index 4d62f967cde..87ee45e69b2 100755 --- a/source/blender/freestyle/intern/system/PseudoNoise.cpp +++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp @@ -36,7 +36,7 @@ PseudoNoise::init (long seed) { _values = new real[NB_VALUE_NOISE]; RandGen::srand48(seed); - for (uint i=0; i<NB_VALUE_NOISE; i++) + for (unsigned int i=0; i<NB_VALUE_NOISE; i++) _values[i] = -1.0 + 2.0 * RandGen::drand48(); } diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp index 556299e45c5..bbdbef10a10 100755 --- a/source/blender/freestyle/intern/system/StringUtils.cpp +++ b/source/blender/freestyle/intern/system/StringUtils.cpp @@ -53,7 +53,7 @@ namespace StringUtils { stringstream out(""); char s; - for(uint i=0; i < str.size() ; i++){ + for(unsigned int i=0; i < str.size() ; i++){ s = ((char)(str.at(i) & 0x7F)); out << s; } diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript index f9e46b20d9a..53ba2c3e661 100644 --- a/source/blender/imbuf/SConscript +++ b/source/blender/imbuf/SConscript @@ -31,4 +31,4 @@ if env['WITH_BF_QUICKTIME']==1: incs += ' ' + env['BF_QUICKTIME_INC'] defs.append('WITH_QUICKTIME') -env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] ) +env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80,40] ) diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index ce00af8af43..52f5042cd50 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -29,4 +29,4 @@ if env['WITH_BF_OPENEXR']: if env['OURPLATFORM']=='linux2': cflags='-pthread' -env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags ) +env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype=['core'], priority=[45], compileflags=cflags ) |