[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12857] branches/cloth/blender: svn merge -r 12716:12856 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Daniel Genrich daniel.genrich at gmx.net
Wed Dec 12 18:58:07 CET 2007 

Revision: 12857
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12857
Author:   genscher
Date:     2007-12-12 18:58:06 +0100 (Wed, 12 Dec 2007)

Log Message:
-----------
svn merge -r 12716:12856 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/cloth/blender/bin/.blender/locale/de/LC_MESSAGES/blender.mo
    branches/cloth/blender/extern/bFTGL/include/FTGL.h
    branches/cloth/blender/extern/bFTGL/src/Makefile
    branches/cloth/blender/intern/elbeem/intern/isosurface.cpp
    branches/cloth/blender/intern/elbeem/intern/solver_adap.cpp
    branches/cloth/blender/intern/elbeem/intern/solver_main.cpp
    branches/cloth/blender/intern/iksolver/intern/IK_QSegment.cpp
    branches/cloth/blender/intern/opennl/intern/opennl.c
    branches/cloth/blender/po/Makefile
    branches/cloth/blender/po/de.po
    branches/cloth/blender/projectfiles_vc7/blender/blender.sln
    branches/cloth/blender/projectfiles_vc7/blender/render/BRE_render.vcproj
    branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/cloth/blender/release/Makefile
    branches/cloth/blender/release/scripts/mesh_edges2curves.py
    branches/cloth/blender/release/scripts/ply_export.py
    branches/cloth/blender/source/Makefile
    branches/cloth/blender/source/blender/Makefile
    branches/cloth/blender/source/blender/blenkernel/BKE_blender.h
    branches/cloth/blender/source/blender/blenkernel/BKE_mesh.h
    branches/cloth/blender/source/blender/blenkernel/BKE_modifier.h
    branches/cloth/blender/source/blender/blenkernel/BKE_particle.h
    branches/cloth/blender/source/blender/blenkernel/BKE_pointcache.h
    branches/cloth/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/cloth/blender/source/blender/blenkernel/intern/action.c
    branches/cloth/blender/source/blender/blenkernel/intern/anim.c
    branches/cloth/blender/source/blender/blenkernel/intern/armature.c
    branches/cloth/blender/source/blender/blenkernel/intern/constraint.c
    branches/cloth/blender/source/blender/blenkernel/intern/curve.c
    branches/cloth/blender/source/blender/blenkernel/intern/customdata.c
    branches/cloth/blender/source/blender/blenkernel/intern/depsgraph.c
    branches/cloth/blender/source/blender/blenkernel/intern/displist.c
    branches/cloth/blender/source/blender/blenkernel/intern/image.c
    branches/cloth/blender/source/blender/blenkernel/intern/ipo.c
    branches/cloth/blender/source/blender/blenkernel/intern/lattice.c
    branches/cloth/blender/source/blender/blenkernel/intern/material.c
    branches/cloth/blender/source/blender/blenkernel/intern/mesh.c
    branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
    branches/cloth/blender/source/blender/blenkernel/intern/object.c
    branches/cloth/blender/source/blender/blenkernel/intern/particle.c
    branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
    branches/cloth/blender/source/blender/blenkernel/intern/pointcache.c
    branches/cloth/blender/source/blender/blenlib/BLI_arithb.h
    branches/cloth/blender/source/blender/blenlib/BLI_rand.h
    branches/cloth/blender/source/blender/blenlib/intern/arithb.c
    branches/cloth/blender/source/blender/blenlib/intern/rand.c
    branches/cloth/blender/source/blender/blenlib/intern/util.c
    branches/cloth/blender/source/blender/blenloader/intern/readfile.c
    branches/cloth/blender/source/blender/ftfont/intern/Makefile
    branches/cloth/blender/source/blender/include/BIF_editaction.h
    branches/cloth/blender/source/blender/include/BIF_editarmature.h
    branches/cloth/blender/source/blender/include/BIF_editparticle.h
    branches/cloth/blender/source/blender/include/BIF_gl.h
    branches/cloth/blender/source/blender/include/BIF_interface.h
    branches/cloth/blender/source/blender/include/BIF_poseobject.h
    branches/cloth/blender/source/blender/include/BIF_resources.h
    branches/cloth/blender/source/blender/include/BSE_drawview.h
    branches/cloth/blender/source/blender/include/BSE_editipo.h
    branches/cloth/blender/source/blender/include/blendef.h
    branches/cloth/blender/source/blender/include/butspace.h
    branches/cloth/blender/source/blender/include/transform.h
    branches/cloth/blender/source/blender/makesdna/DNA_action_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_armature_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_constraint_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_customdata_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_material_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_modifier_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_nla_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_object_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_particle_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_scene_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
    branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/cloth/blender/source/blender/nodes/intern/Makefile
    branches/cloth/blender/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/cloth/blender/source/blender/python/BPY_interface.c
    branches/cloth/blender/source/blender/python/api2_2x/Armature.c
    branches/cloth/blender/source/blender/python/api2_2x/CurNurb.c
    branches/cloth/blender/source/blender/python/api2_2x/Curve.c
    branches/cloth/blender/source/blender/python/api2_2x/Draw.c
    branches/cloth/blender/source/blender/python/api2_2x/Lamp.c
    branches/cloth/blender/source/blender/python/api2_2x/Modifier.c
    branches/cloth/blender/source/blender/python/api2_2x/Object.c
    branches/cloth/blender/source/blender/python/api2_2x/Window.c
    branches/cloth/blender/source/blender/python/api2_2x/doc/Modifier.py
    branches/cloth/blender/source/blender/python/api2_2x/doc/Object.py
    branches/cloth/blender/source/blender/python/api2_2x/doc/Render.py
    branches/cloth/blender/source/blender/python/api2_2x/sceneRender.c
    branches/cloth/blender/source/blender/python/api2_2x/sceneSequence.c
    branches/cloth/blender/source/blender/render/extern/include/RE_pipeline.h
    branches/cloth/blender/source/blender/render/extern/include/RE_shader_ext.h
    branches/cloth/blender/source/blender/render/intern/include/render_types.h
    branches/cloth/blender/source/blender/render/intern/include/renderdatabase.h
    branches/cloth/blender/source/blender/render/intern/include/shading.h
    branches/cloth/blender/source/blender/render/intern/include/zbuf.h
    branches/cloth/blender/source/blender/render/intern/source/convertblender.c
    branches/cloth/blender/source/blender/render/intern/source/envmap.c
    branches/cloth/blender/source/blender/render/intern/source/imagetexture.c
    branches/cloth/blender/source/blender/render/intern/source/initrender.c
    branches/cloth/blender/source/blender/render/intern/source/pipeline.c
    branches/cloth/blender/source/blender/render/intern/source/rayshade.c
    branches/cloth/blender/source/blender/render/intern/source/rendercore.c
    branches/cloth/blender/source/blender/render/intern/source/renderdatabase.c
    branches/cloth/blender/source/blender/render/intern/source/shadbuf.c
    branches/cloth/blender/source/blender/render/intern/source/shadeinput.c
    branches/cloth/blender/source/blender/render/intern/source/shadeoutput.c
    branches/cloth/blender/source/blender/render/intern/source/sss.c
    branches/cloth/blender/source/blender/render/intern/source/texture.c
    branches/cloth/blender/source/blender/render/intern/source/zbuf.c
    branches/cloth/blender/source/blender/src/buttons_editing.c
    branches/cloth/blender/source/blender/src/buttons_object.c
    branches/cloth/blender/source/blender/src/buttons_scene.c
    branches/cloth/blender/source/blender/src/buttons_shading.c
    branches/cloth/blender/source/blender/src/drawaction.c
    branches/cloth/blender/source/blender/src/drawarmature.c
    branches/cloth/blender/source/blender/src/drawimasel.c
    branches/cloth/blender/source/blender/src/drawipo.c
    branches/cloth/blender/source/blender/src/drawnla.c
    branches/cloth/blender/source/blender/src/drawnode.c
    branches/cloth/blender/source/blender/src/drawobject.c
    branches/cloth/blender/source/blender/src/drawsound.c
    branches/cloth/blender/source/blender/src/drawtext.c
    branches/cloth/blender/source/blender/src/drawtime.c
    branches/cloth/blender/source/blender/src/drawview.c
    branches/cloth/blender/source/blender/src/edit.c
    branches/cloth/blender/source/blender/src/editaction.c
    branches/cloth/blender/source/blender/src/editarmature.c
    branches/cloth/blender/source/blender/src/editcurve.c
    branches/cloth/blender/source/blender/src/editimasel.c
    branches/cloth/blender/source/blender/src/editipo.c
    branches/cloth/blender/source/blender/src/editipo_lib.c
    branches/cloth/blender/source/blender/src/editipo_mods.c
    branches/cloth/blender/source/blender/src/editlattice.c
    branches/cloth/blender/source/blender/src/editmesh_mods.c
    branches/cloth/blender/source/blender/src/editnla.c
    branches/cloth/blender/source/blender/src/editnode.c
    branches/cloth/blender/source/blender/src/editobject.c
    branches/cloth/blender/source/blender/src/editparticle.c
    branches/cloth/blender/source/blender/src/editscreen.c
    branches/cloth/blender/source/blender/src/editseq.c
    branches/cloth/blender/source/blender/src/editsima.c
    branches/cloth/blender/source/blender/src/editsound.c
    branches/cloth/blender/source/blender/src/edittime.c
    branches/cloth/blender/source/blender/src/editview.c
    branches/cloth/blender/source/blender/src/filesel.c
    branches/cloth/blender/source/blender/src/header_action.c
    branches/cloth/blender/source/blender/src/header_nla.c
    branches/cloth/blender/source/blender/src/header_node.c
    branches/cloth/blender/source/blender/src/header_seq.c
    branches/cloth/blender/source/blender/src/header_view3d.c
    branches/cloth/blender/source/blender/src/interface.c
    branches/cloth/blender/source/blender/src/meshlaplacian.c
    branches/cloth/blender/source/blender/src/meshtools.c
    branches/cloth/blender/source/blender/src/playanim.c
    branches/cloth/blender/source/blender/src/poseobject.c
    branches/cloth/blender/source/blender/src/renderwin.c
    branches/cloth/blender/source/blender/src/resources.c
    branches/cloth/blender/source/blender/src/retopo.c
    branches/cloth/blender/source/blender/src/sculptmode.c
    branches/cloth/blender/source/blender/src/seqeffects.c
    branches/cloth/blender/source/blender/src/space.c
    branches/cloth/blender/source/blender/src/toets.c
    branches/cloth/blender/source/blender/src/toolbox.c
    branches/cloth/blender/source/blender/src/transform.c
    branches/cloth/blender/source/blender/src/transform_conversions.c
    branches/cloth/blender/source/blender/src/transform_manipulator.c
    branches/cloth/blender/source/blender/src/usiblender.c
    branches/cloth/blender/source/blender/src/writeimage.c
    branches/cloth/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/cloth/blender/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
    branches/cloth/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/cloth/blender/source/gameengine/Ketsji/BL_Shader.cpp
    branches/cloth/blender/source/gameengine/Ketsji/BL_Texture.cpp
    branches/cloth/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/cloth/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/cloth/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/cloth/blender/source/nan_compile.mk
    branches/cloth/blender/source/nan_definitions.mk
    branches/cloth/blender/source/nan_link.mk
    branches/cloth/blender/tools/Blender.py

Added Paths:
-----------
    branches/cloth/blender/source/blender/include/reeb.h
    branches/cloth/blender/source/blender/render/intern/include/strand.h
    branches/cloth/blender/source/blender/render/intern/source/strand.c
    branches/cloth/blender/source/blender/src/reeb.c

Removed Paths:
-------------
    branches/cloth/blender/CMakeLists.txt

Deleted: branches/cloth/blender/CMakeLists.txt
===================================================================
--- branches/cloth/blender/CMakeLists.txt	2007-12-12 17:33:59 UTC (rev 12856)
+++ branches/cloth/blender/CMakeLists.txt	2007-12-12 17:58:06 UTC (rev 12857)
@@ -1,426 +0,0 @@
-# $Id$
-# ***** BEGIN GPL/BL DUAL 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. The Blender
-# Foundation also sells licenses for use in proprietary software under
-# the Blender License.  See http://www.blender.org/BL/ for information
-# about this.
-#
-# 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): Jacques Beaurain.
-#
-# ***** END GPL/BL DUAL LICENSE BLOCK *****
-
-#-----------------------------------------------------------------------------
-# We don't allow in-source builds. This causes no end of troubles because 
-# all out-of-source builds will use the CMakeCache.txt file there and even 
-# build the libs and objects in it. It will also conflict with the current 
-# Makefile system for Blender
-
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
-Remove the CMakeCache.txt file and try again from another folder, e.g.: 
-
-   rm CMakeCache.txt 
-   cd ..
-   mkdir cmake-make 
-   cd cmake-make
-   cmake -G \"Unix Makefiles\" ../blender
-")
-ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-PROJECT(Blender)
-
-#-----------------------------------------------------------------------------
-# Redirect output files
-
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
-
-#-----------------------------------------------------------------------------
-# Set default config options
-OPTION(WITH_PLAYER		"Build Player"						OFF)
-OPTION(WITH_GAMEENGINE		"Enable Game Engine"					ON)
-OPTION(WITH_BULLET		"Enable Bullet (Physics Engine)"			ON)
-OPTION(WITH_INTERNATIONAL	"Enable I18N   (International fonts and text)"		ON)
-OPTION(WITH_VERSE		"Enable Verse  (http://verse.blender.org)"		OFF)
-OPTION(WITH_ELBEEM		"Enable Elbeem (Fluid Simulation)"			ON)
-OPTION(WITH_QUICKTIME		"Enable Quicktime Support"				OFF)
-OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	OFF)
-OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
-OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
-OPTION(YESIAMSTUPID		"Enable execution on 64-bit platforms"			OFF)
-OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
-
-IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
-  MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
-ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
-
-# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
-# On Unix: 
-#   cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
-# On Macs: 
-#   cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
-#
-# When changing any of this remember to update the notes in doc/blender-cmake.txt
-
-#-----------------------------------------------------------------------------
-# Load some macros.
-INCLUDE(CMake/macros.cmake)
-
-#-----------------------------------------------------------------------------
-#Platform specifics
-
-IF(UNIX)
-  INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
-  IF(OPENAL_FOUND)
-    SET(WITH_OPENAL ON)
-    SET(OPENAL_LIB ${OPENAL_LIBRARY})
-    SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
-  ELSE(OPENAL_FOUND)
-    SET(WITH_OPENAL OFF)
-  ENDIF(OPENAL_FOUND)
-
-  FIND_LIBRARY(ALUT_LIBRARY
-    NAMES alut
-    PATHS
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-  )
-  IF(ALUT_LIBRARY)
-    SET(OPENAL_LIB ${OPENAL_LIB} ${ALUT_LIBRARY})
-  ENDIF(ALUT_LIBRARY)
-
-  FIND_LIBRARY(INTL_LIBRARY
-    NAMES intl
-    PATHS
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-  )
-  FIND_LIBRARY(ICONV_LIBRARY
-    NAMES iconv
-    PATHS
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-  )
-  IF(INTL_LIBRARY AND ICONV_LIBRARY)
-    SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
-  ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
-  
-  FIND_PATH(FREETYPE_INC
-    freetype
-    PATHS
-    /usr/local/include/freetype2
-    /usr/include/freetype2
-    /sw/include/freetype2
-    /opt/local/include/freetype2
-    /opt/csw/include/freetype2
-    /opt/include/freetype2
-    NO_DEFAULT_PATH
-  )
-  SET(FREETYPE_LIB freetype)
-
-  INCLUDE(${CMAKE_ROOT}/Modules/FindPythonLibs.cmake)
-  SET(PYTHON_INC "${PYTHON_INCLUDE_PATH}" CACHE STRING "")
-  SET(PYTHON_LIB "${PYTHON_LIBRARIES}" CACHE STRING "")
-  INCLUDE(${CMAKE_ROOT}/Modules/FindPythonInterp.cmake)
-  SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
-  SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
-
-  INCLUDE(${CMAKE_ROOT}/Modules/FindSDL.cmake)
-  SET(SDL_INC ${SDL_INCLUDE_DIR})
-  SET(SDL_LIB ${SDL_LIBRARY})
-
-  FIND_PATH(OPENEXR_INC
-    ImfXdr.h
-    PATHS
-    /usr/local/include/OpenEXR
-    /usr/include/OpenEXR
-    /sw/include/OpenEXR
-    /opt/local/include/OpenEXR
-    /opt/csw/include/OpenEXR
-    /opt/include/OpenEXR
-  )
-  SET(OPENEXR_LIB Half IlmImf Iex Imath)
-
-  SET(FFMPEG /usr)
-  SET(FFMPEG_INC ${FFMPEG}/include)
-  SET(FFMPEG_LIB avformat avcodec avutil)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
-
-  SET(JPEG_LIB jpeg)
-
-  SET(PNG_LIB png)
-
-  SET(ZLIB_LIB z)
-
-  SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
-
-  SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
-
-  IF(WITH_OPENMP)
-    SET(LLIBS ${LLIBS} gomp)
-    SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-fopenmp")
-    SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fopenmp")
-  ENDIF(WITH_OPENMP)
-
-  SET(PLATFORM_LINKFLAGS "-pthread")
-
-  INCLUDE_DIRECTORIES(/usr/include /usr/local/include)
-ENDIF(UNIX)
-
-IF(WIN32)
-  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
-
-  SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
-
-  SET(PYTHON ${LIBDIR}/python)
-  SET(PYTHON_VERSION 2.5)
-  SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
-  SET(PYTHON_BINARY python)
-  SET(PYTHON_LIB python25)
-  SET(PYTHON_LIBPATH ${PYTHON}/lib)
-
-  #SET(WITH_OPENAL ON)
-  SET(OPENAL ${LIBDIR}/openal)
-  SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
-  SET(OPENAL_LIB openal_static)
-  SET(OPENAL_LIBPATH ${OPENAL}/lib)
-
-  SET(PNG_LIB libpng_st)
-  SET(JPEG_LIB libjpeg)
-
-  SET(ZLIB ${LIBDIR}/zlib)
-  SET(ZLIB_INC ${ZLIB}/include)
-  SET(ZLIB_LIB libz)
-  SET(ZLIB_LIBPATH ${ZLIB}/lib)
-  
-  SET(PTHREADS ${LIBDIR}/pthreads)
-  SET(PTHREADS_INC ${PTHREADS}/include)
-  SET(PTHREADS_LIB pthreadVC2)
-  SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
-  
-  SET(ICONV ${LIBDIR}/iconv)
-  SET(ICONV_INC ${ICONV}/include)
-  SET(ICONV_LIB iconv)
-  SET(ICONV_LIBPATH ${ICONV}/lib)
-  
-  SET(GETTEXT ${LIBDIR}/gettext)
-  SET(GETTEXT_INC ${GETTEXT}/include)
-  SET(GETTEXT_LIB gnu_gettext)
-  SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
-
-  SET(FREETYPE ${LIBDIR}/freetype)
-  SET(FREETYPE_INC ${FREETYPE}/include ${FREETYPE}/include/freetype2)
-  SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
-  SET(FREETYPE_LIB freetype2ST)
-  
-  SET(OPENEXR ${LIBDIR}/openexr)
-  SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
-  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
-  IF (MSVC80)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
-  ELSE (MSVC80)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
-  ENDIF(MSVC80)
-  
-  SET(QUICKTIME ${LIBDIR}/QTDevWin)
-  SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
-  SET(QUICKTIME_LIB qtmlClient)
-  SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
-
-  SET(FFMPEG ${LIBDIR}/ffmpeg)
-  SET(FFMPEG_INC ${FFMPEG}/include)
-  SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
-
-  SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
-  IF(WITH_OPENAL)
-    SET(LLIBS ${LLIBS} dxguid)
-  ENDIF(WITH_OPENAL)
-
-  SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_CXX_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_C_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list