[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14895] branches/soc-2008-mxcurioni: soc-2008-mxcurioni: resolved uint issues (replaced with unsigned int).

[Maxime Curioni]

Revision: 14895
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14895
Author:   mxcurioni
Date:     2008-05-19 15:15:07 +0200 (Mon, 19 May 2008)

Log Message:
-----------
soc-2008-mxcurioni: resolved uint issues (replaced with unsigned int). Still NOT linking

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/extern/freestyle/lib3ds/SConscript
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/ImagePyramid.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/PseudoNoise.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript
    branches/soc-2008-mxcurioni/source/blender/render/SConscript

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2008-05-19 10:13:16 UTC (rev 14894)
+++ branches/soc-2008-mxcurioni/SConstruct	2008-05-19 13:15:07 UTC (rev 14895)
@@ -492,7 +492,7 @@
     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)

Modified: branches/soc-2008-mxcurioni/extern/freestyle/lib3ds/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/extern/freestyle/lib3ds/SConscript	2008-05-19 10:13:16 UTC (rev 14894)
+++ branches/soc-2008-mxcurioni/extern/freestyle/lib3ds/SConscript	2008-05-19 13:15:07 UTC (rev 14895)
@@ -20,7 +20,7 @@
 #
 prefix = 'lib3ds'
 sources = env.Glob(prefix + '/*.c')
-sources.append(prefix + '/chunktable.h')
+# from Makefile - removed: sources.append(prefix + '/chunktable.h')
 
 defs = ''
 cflags = ''

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/ImagePyramid.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/ImagePyramid.cpp	2008-05-19 10:13:16 UTC (rev 14894)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/ImagePyramid.cpp	2008-05-19 13:15:07 UTC (rev 14895)
@@ -58,9 +58,9 @@
   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())

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/PseudoNoise.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/PseudoNoise.cpp	2008-05-19 10:13:16 UTC (rev 14894)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/PseudoNoise.cpp	2008-05-19 13:15:07 UTC (rev 14895)
@@ -36,7 +36,7 @@
 {
   _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();
 }
 

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.cpp	2008-05-19 10:13:16 UTC (rev 14894)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.cpp	2008-05-19 13:15:07 UTC (rev 14895)
@@ -53,7 +53,7 @@
 		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;
 		}	

Modified: branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript	2008-05-19 10:13:16 UTC (rev 14894)
+++ branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript	2008-05-19 13:15:07 UTC (rev 14895)
@@ -31,4 +31,4 @@
 	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] )

Modified: branches/soc-2008-mxcurioni/source/blender/render/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/render/SConscript	2008-05-19 10:13:16 UTC (rev 14894)
+++ branches/soc-2008-mxcurioni/source/blender/render/SConscript	2008-05-19 13:15:07 UTC (rev 14895)
@@ -29,4 +29,4 @@
 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 )