[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46303] branches/smoke2/intern/smoke: Fix compile error with gcc, enable scons compiling

[Daniel Genrich]

Revision: 46303
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46303
Author:   genscher
Date:     2012-05-04 22:34:04 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Fix compile error with gcc, enable scons compiling

Modified Paths:
--------------
    branches/smoke2/intern/smoke/SConscript
    branches/smoke2/intern/smoke/intern/source/smoke.cpp
    branches/smoke2/intern/smoke/intern/source/smoke.h

Modified: branches/smoke2/intern/smoke/SConscript
===================================================================
--- branches/smoke2/intern/smoke/SConscript	2012-05-04 21:45:51 UTC (rev 46302)
+++ branches/smoke2/intern/smoke/SConscript	2012-05-04 22:34:04 UTC (rev 46303)
@@ -2,23 +2,20 @@
 Import ('env')
 
 sources = env.Glob('intern/*.cpp')
-sources += env.Glob('util/*.cpp')
-sources += env.Glob('source/*.cpp')
+sources += env.Glob('intern/util/*.cpp')
+sources += env.Glob('intern/source/*.cpp')
 
 incs = ''
-defs = ''
+defs = ' DDF_GLUTGUI=0 '
 
 if env['WITH_BF_OPENMP']:
     if env['OURPLATFORM'] == 'linuxcross':
         incs += ' ' + env['BF_OPENMP_INC']
 
-    defs += ' PARALLEL=1'
+    defs += ' DDF_OPENMP=1'
 
 incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] 
-incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc '
+incs += ' intern intern/util intern/source  '
 
-if env['WITH_BF_FFTW3']:
-    defs += ' WITH_FFTW3'
-    incs += env['BF_FFTW3_INC'] 
 
 env.BlenderLib ('bf_intern_smoke', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )

Modified: branches/smoke2/intern/smoke/intern/source/smoke.cpp
===================================================================
--- branches/smoke2/intern/smoke/intern/source/smoke.cpp	2012-05-04 21:45:51 UTC (rev 46302)
+++ branches/smoke2/intern/smoke/intern/source/smoke.cpp	2012-05-04 22:34:04 UTC (rev 46303)
@@ -3,6 +3,8 @@
 using namespace std;
 using namespace DDF;
 
+#include <limits.h>
+
 void FLUID_3D::init()
 {
 	printf("-------------------- SMOKE INIT A-------------------------\n");

Modified: branches/smoke2/intern/smoke/intern/source/smoke.h
===================================================================
--- branches/smoke2/intern/smoke/intern/source/smoke.h	2012-05-04 21:45:51 UTC (rev 46302)
+++ branches/smoke2/intern/smoke/intern/source/smoke.h	2012-05-04 22:34:04 UTC (rev 46303)
@@ -22,7 +22,7 @@
 			// functions taken over from standard main
 			bool advanceAllSolvers()
 			{
-				for (unsigned int i=0;i<_solvers.size();i++) {
+				for (unsigned i=0;i<_solvers.size();i++) {
 					if (_solvers[i]->performStep()) return true;
 				}
 				return false;
@@ -30,13 +30,13 @@
 
 			void finalizeAllSolvers()
 			{
-				for (unsigned int i=0;i<_solvers.size();i++)
+				for (unsigned i=0;i<_solvers.size();i++)
 					_solvers[i]->finalize();
 			}
 
 			void initAllSolvers()
 			{
-				for (unsigned int i = 0; i < _solvers.size(); i++)
+				for (int i = 0; i < _solvers.size(); i++)
 					_solvers[i]->forceInit();
 			}
 
@@ -44,7 +44,7 @@
 			{
 				finalizeAllSolvers();
 
-				for (unsigned int i=0;i<_solvers.size();i++)
+				for (unsigned i=0;i<_solvers.size();i++)
 					delete _solvers[i];
 
 				_solvers.clear();