[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22118] branches/itasc: svn merge -r 22060 :22114 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender
Benoit Bolsee
benoit.bolsee at online.be
Sat Aug 1 13:05:00 CEST 2009
Revision: 22118
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22118
Author: ben2610
Date: 2009-08-01 13:04:59 +0200 (Sat, 01 Aug 2009)
Log Message:
-----------
svn merge -r 22060:22114 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/CMakeLists.txt
branches/itasc/config/darwin-config.py
branches/itasc/config/irix6-config.py
branches/itasc/config/linux2-config.py
branches/itasc/config/linuxcross-config.py
branches/itasc/config/openbsd3-config.py
branches/itasc/config/sunos5-config.py
branches/itasc/config/win32-mingw-config.py
branches/itasc/config/win32-vc-config.py
branches/itasc/intern/Makefile
branches/itasc/intern/elbeem/intern/solver_init.cpp
branches/itasc/intern/smoke/CMakeLists.txt
branches/itasc/intern/smoke/extern/smoke_API.h
branches/itasc/intern/smoke/intern/EIGENVALUE_HELPER.h
branches/itasc/intern/smoke/intern/FFT_NOISE.h
branches/itasc/intern/smoke/intern/FLUID_3D.cpp
branches/itasc/intern/smoke/intern/FLUID_3D.h
branches/itasc/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/itasc/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/itasc/intern/smoke/intern/IMAGE.h
branches/itasc/intern/smoke/intern/INTERPOLATE.h
branches/itasc/intern/smoke/intern/LICENSE.txt
branches/itasc/intern/smoke/intern/LU_HELPER.h
branches/itasc/intern/smoke/intern/MERSENNETWISTER.h
branches/itasc/intern/smoke/intern/OBSTACLE.h
branches/itasc/intern/smoke/intern/SPHERE.cpp
branches/itasc/intern/smoke/intern/SPHERE.h
branches/itasc/intern/smoke/intern/VEC3.h
branches/itasc/intern/smoke/intern/WAVELET_NOISE.h
branches/itasc/intern/smoke/intern/WTURBULENCE.cpp
branches/itasc/intern/smoke/intern/WTURBULENCE.h
branches/itasc/intern/smoke/intern/smoke_API.cpp
branches/itasc/intern/smoke/intern/tnt/jama_eig.h
branches/itasc/intern/smoke/intern/tnt/jama_lu.h
branches/itasc/intern/smoke/intern/tnt/tnt.h
branches/itasc/intern/smoke/intern/tnt/tnt_array1d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array1d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_array2d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array2d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_array3d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array3d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_cmat.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array1d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array2d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array3d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_i_refvec.h
branches/itasc/intern/smoke/intern/tnt/tnt_math_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
branches/itasc/intern/smoke/intern/tnt/tnt_stopwatch.h
branches/itasc/intern/smoke/intern/tnt/tnt_subscript.h
branches/itasc/intern/smoke/intern/tnt/tnt_vec.h
branches/itasc/intern/smoke/intern/tnt/tnt_version.h
branches/itasc/projectfiles_vc9/blender/blender.sln
branches/itasc/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/itasc/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/itasc/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
branches/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/itasc/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/itasc/release/datafiles/blenderbuttons
branches/itasc/release/ui/buttons_data_mesh.py
branches/itasc/release/ui/buttons_data_metaball.py
branches/itasc/release/ui/buttons_material.py
branches/itasc/release/ui/buttons_physics_field.py
branches/itasc/release/ui/buttons_scene.py
branches/itasc/release/ui/buttons_texture.py
branches/itasc/release/ui/buttons_world.py
branches/itasc/release/ui/space_sequencer.py
branches/itasc/source/Makefile
branches/itasc/source/blender/blenfont/BLF_api.h
branches/itasc/source/blender/blenkernel/BKE_cloth.h
branches/itasc/source/blender/blenkernel/BKE_modifier.h
branches/itasc/source/blender/blenkernel/BKE_smoke.h
branches/itasc/source/blender/blenkernel/intern/Makefile
branches/itasc/source/blender/blenkernel/intern/anim_sys.c
branches/itasc/source/blender/blenkernel/intern/exotic.c
branches/itasc/source/blender/blenkernel/intern/modifier.c
branches/itasc/source/blender/blenkernel/intern/sequence.c
branches/itasc/source/blender/blenkernel/intern/smoke.c
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/editors/animation/keyframing.c
branches/itasc/source/blender/editors/armature/editarmature.c
branches/itasc/source/blender/editors/armature/editarmature_retarget.c
branches/itasc/source/blender/editors/armature/meshlaplacian.c
branches/itasc/source/blender/editors/datafiles/blenderbuttons.c
branches/itasc/source/blender/editors/include/ED_previewrender.h
branches/itasc/source/blender/editors/include/ED_screen_types.h
branches/itasc/source/blender/editors/include/UI_icons.h
branches/itasc/source/blender/editors/interface/interface_anim.c
branches/itasc/source/blender/editors/interface/interface_templates.c
branches/itasc/source/blender/editors/mesh/editmesh_mods.c
branches/itasc/source/blender/editors/mesh/editmesh_tools.c
branches/itasc/source/blender/editors/mesh/meshtools.c
branches/itasc/source/blender/editors/object/editkey.c
branches/itasc/source/blender/editors/object/object_edit.c
branches/itasc/source/blender/editors/physics/ed_fluidsim.c
branches/itasc/source/blender/editors/preview/previewrender.c
branches/itasc/source/blender/editors/screen/screen_edit.c
branches/itasc/source/blender/editors/screen/screen_ops.c
branches/itasc/source/blender/editors/screen/screendump.c
branches/itasc/source/blender/editors/space_file/writeimage.c
branches/itasc/source/blender/editors/space_logic/logic_window.c
branches/itasc/source/blender/editors/space_nla/nla_buttons.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_add.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_edit.c
branches/itasc/source/blender/editors/space_text/text_python.c
branches/itasc/source/blender/editors/space_time/space_time.c
branches/itasc/source/blender/editors/space_time/time_header.c
branches/itasc/source/blender/editors/space_view3d/Makefile
branches/itasc/source/blender/editors/space_view3d/drawobject.c
branches/itasc/source/blender/editors/space_view3d/view3d_select.c
branches/itasc/source/blender/editors/transform/transform.c
branches/itasc/source/blender/editors/transform/transform_generics.c
branches/itasc/source/blender/makesdna/DNA_actuator_types.h
branches/itasc/source/blender/makesdna/DNA_anim_types.h
branches/itasc/source/blender/makesdna/DNA_meta_types.h
branches/itasc/source/blender/makesdna/DNA_scene_types.h
branches/itasc/source/blender/makesdna/DNA_smoke_types.h
branches/itasc/source/blender/makesdna/DNA_userdef_types.h
branches/itasc/source/blender/makesrna/RNA_enum_types.h
branches/itasc/source/blender/makesrna/intern/rna_animation.c
branches/itasc/source/blender/makesrna/intern/rna_key.c
branches/itasc/source/blender/makesrna/intern/rna_meta.c
branches/itasc/source/blender/makesrna/intern/rna_modifier.c
branches/itasc/source/blender/makesrna/intern/rna_nla.c
branches/itasc/source/blender/makesrna/intern/rna_smoke.c
branches/itasc/source/blender/makesrna/intern/rna_space.c
branches/itasc/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
branches/itasc/source/blender/python/generic/bpy_internal_import.c
branches/itasc/source/blender/render/intern/source/pipeline.c
branches/itasc/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/itasc/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/itasc/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/itasc/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/itasc/source/gameengine/Converter/BL_SkinMeshObject.h
branches/itasc/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/itasc/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/itasc/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/itasc/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/itasc/source/gameengine/Converter/KX_ConvertSensors.h
branches/itasc/source/gameengine/Expressions/Value.cpp
branches/itasc/source/gameengine/GameLogic/SCA_IScene.h
branches/itasc/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/itasc/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/itasc/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/itasc/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/itasc/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/itasc/source/gameengine/Ketsji/KX_GameObject.cpp
branches/itasc/source/gameengine/Ketsji/KX_GameObject.h
branches/itasc/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/itasc/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/itasc/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_NearSensor.h
branches/itasc/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/itasc/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/itasc/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_RadarSensor.h
branches/itasc/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/itasc/source/gameengine/Ketsji/KX_Scene.cpp
branches/itasc/source/gameengine/Ketsji/KX_Scene.h
branches/itasc/source/gameengine/PyDoc/GameTypes.py
branches/itasc/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/itasc/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/itasc/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/itasc/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/itasc/source/nan_definitions.mk
Added Paths:
-----------
branches/itasc/intern/smoke/Makefile
branches/itasc/intern/smoke/intern/Makefile
branches/itasc/intern/smoke/make/
branches/itasc/intern/smoke/make/msvc_9_0/
branches/itasc/intern/smoke/make/msvc_9_0/smoke.vcproj
Removed Paths:
-------------
branches/itasc/intern/smoke/make/msvc_9_0/
branches/itasc/intern/smoke/make/msvc_9_0/smoke.vcproj
Property Changed:
----------------
branches/itasc/intern/smoke/CMakeLists.txt
branches/itasc/intern/smoke/intern/EIGENVALUE_HELPER.h
branches/itasc/intern/smoke/intern/FFT_NOISE.h
branches/itasc/intern/smoke/intern/FLUID_3D.h
branches/itasc/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/itasc/intern/smoke/intern/INTERPOLATE.h
branches/itasc/intern/smoke/intern/LICENSE.txt
branches/itasc/intern/smoke/intern/LU_HELPER.h
branches/itasc/intern/smoke/intern/MERSENNETWISTER.h
branches/itasc/intern/smoke/intern/OBSTACLE.h
branches/itasc/intern/smoke/intern/SPHERE.cpp
branches/itasc/intern/smoke/intern/SPHERE.h
branches/itasc/intern/smoke/intern/VEC3.h
branches/itasc/intern/smoke/intern/WTURBULENCE.cpp
branches/itasc/intern/smoke/intern/WTURBULENCE.h
branches/itasc/intern/smoke/intern/tnt/jama_eig.h
branches/itasc/intern/smoke/intern/tnt/jama_lu.h
branches/itasc/intern/smoke/intern/tnt/tnt.h
branches/itasc/intern/smoke/intern/tnt/tnt_array1d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array1d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_array2d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array2d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_array3d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array3d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_cmat.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array1d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array2d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array3d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_i_refvec.h
branches/itasc/intern/smoke/intern/tnt/tnt_math_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
branches/itasc/intern/smoke/intern/tnt/tnt_stopwatch.h
branches/itasc/intern/smoke/intern/tnt/tnt_subscript.h
branches/itasc/intern/smoke/intern/tnt/tnt_vec.h
branches/itasc/intern/smoke/intern/tnt/tnt_version.h
branches/itasc/source/blender/blenkernel/BKE_smoke.h
branches/itasc/source/blender/makesdna/DNA_smoke_types.h
branches/itasc/source/blender/makesrna/intern/rna_smoke.c
Modified: branches/itasc/CMakeLists.txt
===================================================================
--- branches/itasc/CMakeLists.txt 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/CMakeLists.txt 2009-08-01 11:04:59 UTC (rev 22118)
@@ -382,11 +382,7 @@
SET(OPENEXR ${LIBDIR}/openexr)
SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
- IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
- ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- SET(OPENEXR_LIB Iex Half IlmImf Imath)
- ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
SET(LLIBS stdc++ SystemStubs)
Modified: branches/itasc/config/darwin-config.py
===================================================================
--- branches/itasc/config/darwin-config.py 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/config/darwin-config.py 2009-08-01 11:04:59 UTC (rev 22118)
@@ -151,7 +151,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE=True
-WITH_BF_PLAYER=True
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/itasc/config/irix6-config.py
===================================================================
--- branches/itasc/config/irix6-config.py 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/config/irix6-config.py 2009-08-01 11:04:59 UTC (rev 22118)
@@ -73,6 +73,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE='false'
+WITH_BF_PLAYER = 'false'
WITH_BF_BULLET = 'true'
BF_BULLET = '#extern/bullet2/src'
Modified: branches/itasc/config/linux2-config.py
===================================================================
--- branches/itasc/config/linux2-config.py 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/config/linux2-config.py 2009-08-01 11:04:59 UTC (rev 22118)
@@ -67,7 +67,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/itasc/config/linuxcross-config.py
===================================================================
--- branches/itasc/config/linuxcross-config.py 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/config/linuxcross-config.py 2009-08-01 11:04:59 UTC (rev 22118)
@@ -73,6 +73,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = False
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/itasc/config/openbsd3-config.py
===================================================================
--- branches/itasc/config/openbsd3-config.py 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/config/openbsd3-config.py 2009-08-01 11:04:59 UTC (rev 22118)
@@ -60,6 +60,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE=False
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/itasc/config/sunos5-config.py
===================================================================
--- branches/itasc/config/sunos5-config.py 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/config/sunos5-config.py 2009-08-01 11:04:59 UTC (rev 22118)
@@ -68,6 +68,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE=False
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/itasc/config/win32-mingw-config.py
===================================================================
--- branches/itasc/config/win32-mingw-config.py 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/config/win32-mingw-config.py 2009-08-01 11:04:59 UTC (rev 22118)
@@ -81,6 +81,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = False
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/itasc/config/win32-vc-config.py
===================================================================
--- branches/itasc/config/win32-vc-config.py 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/config/win32-vc-config.py 2009-08-01 11:04:59 UTC (rev 22118)
@@ -88,7 +88,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/itasc/intern/Makefile
===================================================================
--- branches/itasc/intern/Makefile 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/intern/Makefile 2009-08-01 11:04:59 UTC (rev 22118)
@@ -32,7 +32,7 @@
# include nan_subdirs.mk
ALLDIRS = string ghost guardedalloc moto container memutil
-ALLDIRS += decimation iksolver itasc bsp SoundSystem opennl elbeem boolop
+ALLDIRS += decimation iksolver itasc bsp SoundSystem opennl elbeem boolop smoke
all::
@for i in $(ALLDIRS); do \
Modified: branches/itasc/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/itasc/intern/elbeem/intern/solver_init.cpp 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/intern/elbeem/intern/solver_init.cpp 2009-08-01 11:04:59 UTC (rev 22118)
@@ -1464,7 +1464,7 @@
obj->applyTransformation(targetTime, &mMOIVertices,NULL /* no old normals needed */, 0, mMOIVertices.size(), false );
} else {
// only do transform update
- obj->getMovingPoints(mMOIVertices,pNormals);
+ obj->getMovingPoints(mMOIVertices,pNormals); // mMOIVertices = mCachedMovPoints
mMOIVerticesOld = mMOIVertices;
// WARNING - assumes mSimulationTime is global!?
obj->applyTransformation(targetTime, &mMOIVertices,pNormals, 0, mMOIVertices.size(), false );
Modified: branches/itasc/intern/smoke/CMakeLists.txt
===================================================================
--- branches/itasc/intern/smoke/CMakeLists.txt 2009-08-01 10:54:22 UTC (rev 22117)
+++ branches/itasc/intern/smoke/CMakeLists.txt 2009-08-01 11:04:59 UTC (rev 22118)
@@ -1,38 +1,38 @@
-# $Id$
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Daniel Genrich
-#
-# ***** END GPL LICENSE BLOCK *****
-
-SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
-# ${FFTW3_INC}
-
-FILE(GLOB SRC intern/*.cpp)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-
-BLENDERLIB(bf_smoke "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Daniel Genrich
+#
+# ***** END GPL LICENSE BLOCK *****
+
+SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
+# ${FFTW3_INC}
+
+FILE(GLOB SRC intern/*.cpp)
+
+IF(WITH_OPENMP)
+ ADD_DEFINITIONS(-DPARALLEL=1)
+ENDIF(WITH_OPENMP)
+
+
+BLENDERLIB(bf_smoke "${SRC}" "${INC}")
+#, libtype='blender', priority = 0 )
Property changes on: branches/itasc/intern/smoke/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: branches/itasc/intern/smoke/Makefile (from rev 22114, branches/blender2.5/blender/intern/smoke/Makefile)
===================================================================
--- branches/itasc/intern/smoke/Makefile (rev 0)
+++ branches/itasc/intern/smoke/Makefile 2009-08-01 11:04:59 UTC (rev 22118)
@@ -0,0 +1,54 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
+#
+# $Id$
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Hans Lambermont, GSR
+#
+# ***** END GPL LICENSE BLOCK *****
+# smoke main makefile.
+#
+
+include nan_definitions.mk
+
+unexport NAN_QUIET
+
+LIBNAME = smoke
+SOURCEDIR = intern/$(LIBNAME)
+DIR = $(OCGDIR)/$(SOURCEDIR)
+DIRS = intern
+#not ready yet TESTDIRS = test
+
+include nan_subdirs.mk
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list