Revision: 42685 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42685 Author: mont29 Date: 2011-12-17 12:29:51 +0000 (Sat, 17 Dec 2011) Log Message: ----------- Merged with trunk (42606:42684).
Modified Paths: -------------- branches/vgroup_modifiers/extern/eltopo/CMakeLists.txt branches/vgroup_modifiers/extern/eltopo/common/gluvi.h branches/vgroup_modifiers/extern/eltopo/common/predicates.cpp branches/vgroup_modifiers/extern/eltopo/common/tunicate/orientation.cpp branches/vgroup_modifiers/extern/eltopo/common/tunicate/sos_orientation.cpp branches/vgroup_modifiers/extern/eltopo/eltopo3d/dynamicsurface.cpp branches/vgroup_modifiers/extern/eltopo/eltopo3d/surftrack.cpp branches/vgroup_modifiers/extern/libmv/CMakeLists.txt branches/vgroup_modifiers/extern/libmv/SConscript branches/vgroup_modifiers/extern/libmv/bundle.sh branches/vgroup_modifiers/extern/libmv/files.txt branches/vgroup_modifiers/extern/libmv/mkfiles.sh branches/vgroup_modifiers/intern/audaspace/intern/AUD_C-API.cpp branches/vgroup_modifiers/intern/cycles/app/cycles_xml.cpp branches/vgroup_modifiers/intern/cycles/blender/blender_shader.cpp branches/vgroup_modifiers/intern/cycles/kernel/CMakeLists.txt branches/vgroup_modifiers/intern/cycles/kernel/osl/nodes/CMakeLists.txt branches/vgroup_modifiers/intern/cycles/kernel/svm/svm.h branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_types.h branches/vgroup_modifiers/intern/cycles/render/nodes.cpp branches/vgroup_modifiers/intern/cycles/render/nodes.h branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemWin32.cpp branches/vgroup_modifiers/release/datafiles/splash.png branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_texture.py branches/vgroup_modifiers/source/blender/avi/intern/avi.c branches/vgroup_modifiers/source/blender/avi/intern/codecs.c branches/vgroup_modifiers/source/blender/avi/intern/endian.c branches/vgroup_modifiers/source/blender/avi/intern/mjpeg.c branches/vgroup_modifiers/source/blender/avi/intern/options.c branches/vgroup_modifiers/source/blender/avi/intern/rgb32.c branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_deform.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_object.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_tracking.h branches/vgroup_modifiers/source/blender/blenkernel/intern/CCGSubSurf.c branches/vgroup_modifiers/source/blender/blenkernel/intern/CCGSubSurf.h branches/vgroup_modifiers/source/blender/blenkernel/intern/DerivedMesh.c branches/vgroup_modifiers/source/blender/blenkernel/intern/anim.c branches/vgroup_modifiers/source/blender/blenkernel/intern/armature.c branches/vgroup_modifiers/source/blender/blenkernel/intern/boids.c branches/vgroup_modifiers/source/blender/blenkernel/intern/camera.c branches/vgroup_modifiers/source/blender/blenkernel/intern/constraint.c branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c branches/vgroup_modifiers/source/blender/blenkernel/intern/deform.c branches/vgroup_modifiers/source/blender/blenkernel/intern/fcurve.c branches/vgroup_modifiers/source/blender/blenkernel/intern/image.c branches/vgroup_modifiers/source/blender/blenkernel/intern/image_gen.c branches/vgroup_modifiers/source/blender/blenkernel/intern/lattice.c branches/vgroup_modifiers/source/blender/blenkernel/intern/material.c branches/vgroup_modifiers/source/blender/blenkernel/intern/mball.c branches/vgroup_modifiers/source/blender/blenkernel/intern/node.c branches/vgroup_modifiers/source/blender/blenkernel/intern/object.c branches/vgroup_modifiers/source/blender/blenkernel/intern/ocean.c branches/vgroup_modifiers/source/blender/blenkernel/intern/particle.c branches/vgroup_modifiers/source/blender/blenkernel/intern/pointcache.c branches/vgroup_modifiers/source/blender/blenkernel/intern/subsurf_ccg.c branches/vgroup_modifiers/source/blender/blenkernel/intern/suggestions.c branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c branches/vgroup_modifiers/source/blender/blenlib/BLI_ghash.h branches/vgroup_modifiers/source/blender/blenlib/BLI_math_base.h branches/vgroup_modifiers/source/blender/blenlib/BLI_math_geom.h branches/vgroup_modifiers/source/blender/blenlib/BLI_math_matrix.h branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_dynstr.c branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_ghash.c branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_linklist.c branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_memarena.c branches/vgroup_modifiers/source/blender/blenlib/intern/edgehash.c branches/vgroup_modifiers/source/blender/blenlib/intern/math_base_inline.c branches/vgroup_modifiers/source/blender/blenlib/intern/math_geom.c branches/vgroup_modifiers/source/blender/blenlib/intern/math_matrix.c branches/vgroup_modifiers/source/blender/blenlib/intern/math_rotation.c branches/vgroup_modifiers/source/blender/blenlib/intern/rand.c branches/vgroup_modifiers/source/blender/blenlib/intern/winstuff.c branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c branches/vgroup_modifiers/source/blender/collada/AnimationExporter.cpp branches/vgroup_modifiers/source/blender/collada/AnimationImporter.cpp branches/vgroup_modifiers/source/blender/collada/ArmatureExporter.cpp branches/vgroup_modifiers/source/blender/collada/ArmatureImporter.cpp branches/vgroup_modifiers/source/blender/collada/DocumentImporter.cpp branches/vgroup_modifiers/source/blender/collada/TransformReader.cpp branches/vgroup_modifiers/source/blender/collada/TransformWriter.cpp branches/vgroup_modifiers/source/blender/collada/collada_utils.cpp branches/vgroup_modifiers/source/blender/editors/animation/keyingsets.c branches/vgroup_modifiers/source/blender/editors/armature/editarmature.c branches/vgroup_modifiers/source/blender/editors/curve/curve_ops.c branches/vgroup_modifiers/source/blender/editors/curve/editcurve.c branches/vgroup_modifiers/source/blender/editors/datafiles/splash.png.c branches/vgroup_modifiers/source/blender/editors/include/ED_curve.h branches/vgroup_modifiers/source/blender/editors/include/ED_mesh.h branches/vgroup_modifiers/source/blender/editors/interface/interface.c branches/vgroup_modifiers/source/blender/editors/interface/interface_draw.c branches/vgroup_modifiers/source/blender/editors/interface/interface_intern.h branches/vgroup_modifiers/source/blender/editors/interface/interface_widgets.c branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_lib.c branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c branches/vgroup_modifiers/source/blender/editors/mesh/mesh_navmesh.c branches/vgroup_modifiers/source/blender/editors/mesh/meshtools.c branches/vgroup_modifiers/source/blender/editors/object/object_add.c branches/vgroup_modifiers/source/blender/editors/object/object_constraint.c branches/vgroup_modifiers/source/blender/editors/object/object_hook.c branches/vgroup_modifiers/source/blender/editors/object/object_relations.c branches/vgroup_modifiers/source/blender/editors/object/object_vgroup.c branches/vgroup_modifiers/source/blender/editors/physics/physics_pointcache.c branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex.c branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c branches/vgroup_modifiers/source/blender/editors/sound/sound_ops.c branches/vgroup_modifiers/source/blender/editors/space_action/action_select.c branches/vgroup_modifiers/source/blender/editors/space_api/spacetypes.c branches/vgroup_modifiers/source/blender/editors/space_clip/clip_ops.c branches/vgroup_modifiers/source/blender/editors/space_clip/tracking_ops.c branches/vgroup_modifiers/source/blender/editors/space_graph/graph_select.c branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_select.c branches/vgroup_modifiers/source/blender/editors/space_view3d/drawanimviz.c branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c branches/vgroup_modifiers/source/blender/editors/space_view3d/drawvolume.c branches/vgroup_modifiers/source/blender/editors/space_view3d/space_view3d.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_buttons.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_draw.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_edit.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_fly.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_select.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_view.c branches/vgroup_modifiers/source/blender/editors/transform/transform.c branches/vgroup_modifiers/source/blender/editors/transform/transform_constraints.c branches/vgroup_modifiers/source/blender/editors/transform/transform_conversions.c branches/vgroup_modifiers/source/blender/editors/transform/transform_generics.c branches/vgroup_modifiers/source/blender/editors/transform/transform_manipulator.c branches/vgroup_modifiers/source/blender/editors/transform/transform_ops.c branches/vgroup_modifiers/source/blender/editors/transform/transform_orientations.c branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_ops.c branches/vgroup_modifiers/source/blender/gpu/GPU_extensions.h branches/vgroup_modifiers/source/blender/gpu/intern/gpu_codegen.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_draw.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_extensions.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_material.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_shader_material.glsl branches/vgroup_modifiers/source/blender/gpu/intern/gpu_shader_material.glsl.c branches/vgroup_modifiers/source/blender/ikplugin/intern/iksolver_plugin.c branches/vgroup_modifiers/source/blender/ikplugin/intern/itasc_plugin.cpp branches/vgroup_modifiers/source/blender/imbuf/IMB_imbuf.h branches/vgroup_modifiers/source/blender/imbuf/intern/anim_movie.c branches/vgroup_modifiers/source/blender/imbuf/intern/bmp.c branches/vgroup_modifiers/source/blender/imbuf/intern/indexer.c branches/vgroup_modifiers/source/blender/imbuf/intern/jp2.c branches/vgroup_modifiers/source/blender/imbuf/intern/util.c branches/vgroup_modifiers/source/blender/makesdna/DNA_sequence_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_texture_types.h branches/vgroup_modifiers/source/blender/makesrna/intern/rna_material.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree_types.h branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object_api.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_sequencer.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean_util.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cast.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_hook.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshdeform.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mirror.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_screw.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smooth.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_uvproject.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_warp.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_wave.c branches/vgroup_modifiers/source/blender/nodes/CMakeLists.txt branches/vgroup_modifiers/source/blender/nodes/NOD_shader.h branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_normal.c branches/vgroup_modifiers/source/blender/python/intern/bpy_app.c branches/vgroup_modifiers/source/blender/python/intern/bpy_app_handlers.c branches/vgroup_modifiers/source/blender/python/intern/bpy_driver.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_geometry.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_noise.c branches/vgroup_modifiers/source/blender/quicktime/apple/qtkit_export.m branches/vgroup_modifiers/source/blender/quicktime/apple/quicktime_export.c branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c branches/vgroup_modifiers/source/blender/render/intern/source/envmap.c branches/vgroup_modifiers/source/blender/render/intern/source/pointdensity.c branches/vgroup_modifiers/source/blender/render/intern/source/render_texture.c branches/vgroup_modifiers/source/blender/render/intern/source/shadbuf.c branches/vgroup_modifiers/source/blender/render/intern/source/shadeinput.c branches/vgroup_modifiers/source/blender/render/intern/source/strand.c branches/vgroup_modifiers/source/blender/render/intern/source/volumetric.c branches/vgroup_modifiers/source/blender/render/intern/source/zbuf.c branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_draw.c branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_init_exit.c branches/vgroup_modifiers/source/gameengine/Converter/BL_ArmatureChannel.cpp branches/vgroup_modifiers/source/gameengine/Converter/BL_SkinDeformer.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Texture.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonInit.cpp branches/vgroup_modifiers/source/gameengine/Rasterizer/CMakeLists.txt branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_MeshObject.cpp Added Paths: ----------- branches/vgroup_modifiers/intern/cycles/kernel/osl/nodes/node_gamma.osl branches/vgroup_modifiers/intern/cycles/kernel/osl/nodes/node_normal.osl branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_gamma.h branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_normal.h branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_gamma.c Property Changed: ---------------- branches/vgroup_modifiers/ branches/vgroup_modifiers/source/blender/editors/space_outliner/ Property changes on: branches/vgroup_modifiers ___________________________________________________________________ Modified: svn:mergeinfo - /branches/soc-2011-cucumber:37517 /branches/soc-2011-tomato:42376,42378-42379,42397,42400 /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-42605 + /branches/soc-2011-cucumber:37517 /branches/soc-2011-tomato:42376,42378-42379,42397,42400 /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-42684 Modified: branches/vgroup_modifiers/extern/eltopo/CMakeLists.txt =================================================================== --- branches/vgroup_modifiers/extern/eltopo/CMakeLists.txt 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/eltopo/CMakeLists.txt 2011-12-17 12:29:51 UTC (rev 42685) @@ -45,7 +45,6 @@ common/cubic_ccd_wrapper.cpp common/fe_ccd_wrapper.cpp common/fileio.cpp - common/gluvi.cpp common/levelset.cpp common/makelevelset2.cpp common/makelevelset3.cpp @@ -82,7 +81,6 @@ common/clamped_spline.h common/collisionqueries.h common/fileio.h - common/gluvi.h common/grid3.h common/hashtable.h common/lapack_wrapper.h @@ -122,7 +120,7 @@ common/tunicate/tunicate.h ) -add_definitions(-DNOGUI) +add_definitions(-DNO_GUI) add_definitions(-DUSE_FORTRAN_BLAS) blender_add_lib(extern_eltopo "${SRC}" "${INC}" "${INC_SYS}") Modified: branches/vgroup_modifiers/extern/eltopo/common/gluvi.h =================================================================== --- branches/vgroup_modifiers/extern/eltopo/common/gluvi.h 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/eltopo/common/gluvi.h 2011-12-17 12:29:51 UTC (rev 42685) @@ -4,11 +4,13 @@ //#include <iostream> //#include <vector> +#ifdef USE_GUI #ifdef __APPLE__ #include <GLUT/glut.h> // why does Apple have to put glut.h here... #else #include <GL/glut.h> // ...when everyone else puts it here? #endif +#endif //#include "vec.h" @@ -187,8 +189,10 @@ void ppm_screenshot(const char *filename_format, ...); void sgi_screenshot(const char *filename_format, ...); void set_generic_lights(void); +#ifdef USE_GUI void set_generic_material(float r, float g, float b, GLenum face=GL_FRONT_AND_BACK); void set_matte_material(float r, float g, float b, GLenum face=GL_FRONT_AND_BACK); +#endif //@@@@@@@ USEFUL FUNCTIONALITY: void draw_3d_arrow(const float base[3], const float point[3], float arrow_head_length=0); //void draw_2d_arrow(const Vec2f base, const Vec2f point, float arrow_head_length); Modified: branches/vgroup_modifiers/extern/eltopo/common/predicates.cpp =================================================================== --- branches/vgroup_modifiers/extern/eltopo/common/predicates.cpp 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/eltopo/common/predicates.cpp 2011-12-17 12:29:51 UTC (rev 42685) @@ -1,6 +1,11 @@ #include <cfloat> #include "predicates.h" +#if defined(_WIN32) && !defined(FREE_WINDOWS) +#define random() rand() // not sure if this define is valid +#define _Ios_Fmtflags ios::fmtflags +#endif + static void print_hex( double d ) { std::_Ios_Fmtflags originalFlags = std::cout.flags(); Modified: branches/vgroup_modifiers/extern/eltopo/common/tunicate/orientation.cpp =================================================================== --- branches/vgroup_modifiers/extern/eltopo/common/tunicate/orientation.cpp 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/eltopo/common/tunicate/orientation.cpp 2011-12-17 12:29:51 UTC (rev 42685) @@ -1,7 +1,16 @@ // Released into the public domain by Robert Bridson, 2009. #include <cassert> +#if defined(_WIN32) && !defined(FREE_WINDOWS) +#include <float.h> +#pragma fenv_access (on) +#define FE_UPWARD _RC_UP +#define FE_DOWNWARD _RC_DOWN +#define FE_TONEAREST _RC_NEAR +#define fesetround(r) (_controlfp(r, _MCW_RC)) +#else #include <fenv.h> +#endif #include <cmath> #include <limits> #include "tunicate.h" Modified: branches/vgroup_modifiers/extern/eltopo/common/tunicate/sos_orientation.cpp =================================================================== --- branches/vgroup_modifiers/extern/eltopo/common/tunicate/sos_orientation.cpp 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/eltopo/common/tunicate/sos_orientation.cpp 2011-12-17 12:29:51 UTC (rev 42685) @@ -2,7 +2,12 @@ #include <algorithm> #include <cassert> +#if defined(_WIN32) && !defined(FREE_WINDOWS) +#include <float.h> +#pragma fenv_access (on) +#else #include <fenv.h> +#endif #include <cmath> #include <limits> #include "tunicate.h" Modified: branches/vgroup_modifiers/extern/eltopo/eltopo3d/dynamicsurface.cpp =================================================================== --- branches/vgroup_modifiers/extern/eltopo/eltopo3d/dynamicsurface.cpp 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/eltopo/eltopo3d/dynamicsurface.cpp 2011-12-17 12:29:51 UTC (rev 42685) @@ -18,6 +18,7 @@ #include <deque> #include <queue> +#ifdef USE_GUI #ifdef __APPLE__ #include <OpenGL/gl.h> #else @@ -26,6 +27,7 @@ #endif #include <GL/gl.h> #endif +#endif #include <vec.h> #include <mat.h> Modified: branches/vgroup_modifiers/extern/eltopo/eltopo3d/surftrack.cpp =================================================================== --- branches/vgroup_modifiers/extern/eltopo/eltopo3d/surftrack.cpp 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/eltopo/eltopo3d/surftrack.cpp 2011-12-17 12:29:51 UTC (rev 42685) @@ -19,6 +19,7 @@ #include <vector> #include <queue> +#ifdef USE_GUI #ifdef __APPLE__ #include <OpenGL/gl.h> #include <GLUT/glut.h> @@ -30,6 +31,7 @@ #include <GL/gl.h> #include <GL/glut.h> #endif +#endif #include <ccd_wrapper.h> #include <cassert> Modified: branches/vgroup_modifiers/extern/libmv/CMakeLists.txt =================================================================== --- branches/vgroup_modifiers/extern/libmv/CMakeLists.txt 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/libmv/CMakeLists.txt 2011-12-17 12:29:51 UTC (rev 42685) @@ -22,6 +22,10 @@ # # ***** END GPL LICENSE BLOCK ***** +# NOTEL This file is automatically generated by bundle.sh script +# If you're doing changes in this file, please update template +# in that script too + set(INC . ../Eigen3 Modified: branches/vgroup_modifiers/extern/libmv/SConscript =================================================================== --- branches/vgroup_modifiers/extern/libmv/SConscript 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/libmv/SConscript 2011-12-17 12:29:51 UTC (rev 42685) @@ -1,4 +1,9 @@ #!/usr/bin/python + +# NOTEL This file is automatically generated by bundle.sh script +# If you're doing changes in this file, please update template +# in that script too + import sys import os Modified: branches/vgroup_modifiers/extern/libmv/bundle.sh =================================================================== --- branches/vgroup_modifiers/extern/libmv/bundle.sh 2011-12-17 12:09:28 UTC (rev 42684) +++ branches/vgroup_modifiers/extern/libmv/bundle.sh 2011-12-17 12:29:51 UTC (rev 42685) @@ -33,14 +33,14 @@ chmod 664 ./third_party/glog/src/windows/*.cc ./third_party/glog/src/windows/*.h ./third_party/glog/src/windows/glog/*.h -sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/'` -headers=`find ./libmv -type f -iname '*.h' | sed -r 's/^\.\//\t/'` +sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | sort -d` +headers=`find ./libmv -type f -iname '*.h' | sed -r 's/^\.\//\t/' | sort -d` -third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v glog | sed -r 's/^\.\//\t/'` -third_headers=`find ./third_party -type f -iname '*.h' | grep -v glog | sed -r 's/^\.\//\t/'` +third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v glog | sed -r 's/^\.\//\t/' | sort` +third_headers=`find ./third_party -type f -iname '*.h' | grep -v glog | sed -r 's/^\.\//\t/' | sort` -third_glog_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/'` -third_glog_headers=`find ./third_party -type f -iname '*.h' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/'` +third_glog_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/' | sort` +third_glog_headers=`find ./third_party -type f -iname '*.h' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/' | sort` src_dir=`find ./libmv -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/' | sort | uniq` src_third_dir=`find ./third_party -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/' | sort | uniq` @@ -89,7 +89,6 @@ done cat > CMakeLists.txt << EOF -# \$Id\$ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or @@ -114,17 +113,21 @@ # # ***** END GPL LICENSE BLOCK ***** +# NOTEL This file is automatically generated by bundle.sh script +# If you're doing changes in this file, please update template +# in that script too + set(INC . ../Eigen3 - ./third_party/ssba - ./third_party/ldl/Include + third_party/ssba + third_party/ldl/Include ../colamd/Include ) set(INC_SYS - ${PNG_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} + \${PNG_INCLUDE_DIR} + \${ZLIB_INCLUDE_DIRS} ) set(SRC @@ -139,7 +142,7 @@ ${third_headers} ) -IF(WIN32) +if(WIN32) list(APPEND SRC third_party/glog/src/logging.cc third_party/glog/src/raw_logging.cc @@ -167,28 +170,23 @@ ) list(APPEND INC - ./third_party/glog/src/windows + third_party/glog/src/windows ) - IF(NOT MINGW) + if(NOT MINGW) list(APPEND INC - ./third_party/msinttypes + third_party/msinttypes ) - ENDIF(MINGW) + endif() - list(APPEND INC - ./third_party/glog/src/windows - ./third_party/msinttypes - ) - - IF(MSVC) + if(MSVC) set(MSVC_OFLAGS O1 O2 Ox) foreach(FLAG \${MSVC_OFLAGS}) string(REPLACE "\${FLAG}" "Od" CMAKE_CXX_FLAGS_RELEASE "\${CMAKE_CXX_FLAGS_RELEASE}") @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs