[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30049] branches/soc-2010-jwilkins: more merge fixes

Jason Wilkins Jason.A.Wilkins at gmail.com
Tue Jul 6 18:40:01 CEST 2010


Revision: 30049
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30049
Author:   jwilkins
Date:     2010-07-06 18:40:01 +0200 (Tue, 06 Jul 2010)

Log Message:
-----------
more merge fixes

Modified Paths:
--------------
    branches/soc-2010-jwilkins/CMakeLists.txt
    branches/soc-2010-jwilkins/config/darwin-config.py
    branches/soc-2010-jwilkins/config/linux2-config.py
    branches/soc-2010-jwilkins/config/linuxcross-config.py
    branches/soc-2010-jwilkins/config/win32-mingw-config.py
    branches/soc-2010-jwilkins/config/win32-vc-config.py
    branches/soc-2010-jwilkins/config/win64-vc-config.py
    branches/soc-2010-jwilkins/doc/blender.1
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_displist.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_image.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_mball.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_scene.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/action.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/blender.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/lattice.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mball.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/node.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/texture.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/bpath.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/pbvh.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/writefile.c
    branches/soc-2010-jwilkins/source/blender/collada/DocumentImporter.cpp
    branches/soc-2010-jwilkins/source/blender/editors/animation/anim_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/poselib.c
    branches/soc-2010-jwilkins/source/blender/editors/curve/editcurve.c
    branches/soc-2010-jwilkins/source/blender/editors/curve/editfont.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_keyframing.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_mesh.h
    branches/soc-2010-jwilkins/source/blender/editors/include/UI_interface.h
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_layout.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_regions.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/metaball/mball_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_modifier.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_internal.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_opengl.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screen_context.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screen_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screendump.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-jwilkins/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/filesel.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-jwilkins/source/blender/editors/space_text/text_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_time/space_time.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_group.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/soc-2010-jwilkins/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-jwilkins/source/blender/python/doc/sphinx_doc_gen.sh
    branches/soc-2010-jwilkins/source/blender/python/generic/bgl.c
    branches/soc-2010-jwilkins/source/blender/python/generic/blf_api.c
    branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-jwilkins/source/blender/python/generic/geometry.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_driver.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_interface.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_props.c
    branches/soc-2010-jwilkins/source/blender/render/intern/include/render_types.h
    branches/soc-2010-jwilkins/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/pipeline.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/pointdensity.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/rayshade.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/texture.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/WM_api.h
    branches/soc-2010-jwilkins/source/blender/windowmanager/WM_types.h
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-jwilkins/tools/btools.py

Added Paths:
-----------
    branches/soc-2010-jwilkins/config/CMakeLists.txt
    branches/soc-2010-jwilkins/doc/blender.1.py
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_cpu.h
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/cpu.c
    branches/soc-2010-jwilkins/source/blender/python/doc/examples/bpy.data.py

Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt	2010-07-06 16:39:40 UTC (rev 30048)
+++ branches/soc-2010-jwilkins/CMakeLists.txt	2010-07-06 16:40:01 UTC (rev 30049)
@@ -114,7 +114,7 @@
 OPTION(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
 
 # Misc
-OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" OFF) 
+OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
@@ -230,6 +230,10 @@
 			/opt/include/OpenEXR
 		)
 		SET(OPENEXR_LIB Half IlmImf Iex Imath)
+		
+		IF(NOT OPENEXR_INC)
+			SET(WITH_OPENEXR OFF)
+		ENDIF(NOT OPENEXR_INC)
 	ENDIF(WITH_OPENEXR)
 
 	IF(WITH_TIFF)
@@ -720,7 +724,12 @@
 		SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
 	ENDIF(WITH_OPENEXR)
 
-    # TODO: IF(WITH_LCMS)
+	IF(WITH_LCMS)
+		SET(LCMS ${LIBDIR}/lcms)
+		SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+		SET(LCMS_LIBRARY lcms)
+		SET(LCMS_LIBPATH ${LCMS}/lib)
+	ENDIF(WITH_LCMS)
 
 	IF(WITH_FFMPEG)
 		SET(FFMPEG ${LIBDIR}/ffmpeg)

Added: branches/soc-2010-jwilkins/config/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/config/CMakeLists.txt	                        (rev 0)
+++ branches/soc-2010-jwilkins/config/CMakeLists.txt	2010-07-06 16:40:01 UTC (rev 30049)
@@ -0,0 +1,912 @@
+# $Id: CMakeLists.txt 29944 2010-07-04 18:40:59Z blendix $
+# ***** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 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.6)
+
+# quiet output for Makefiles, 'make -s' helps too
+# SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
+
+PROJECT(Blender)
+
+#-----------------------------------------------------------------------------
+# Redirect output files
+
+SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
+
+# Note! - Could create this from the blender version string
+# ...but thats quite involved, make sure this matches the blender version.
+SET(BLENDER_VERSION  2.5)
+
+#-----------------------------------------------------------------------------
+# Load some macros.
+INCLUDE(CMake/macros.cmake)
+
+#-----------------------------------------------------------------------------
+# Set default config options
+
+# Blender internal features
+OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
+OPTION(WITH_LCMS          "Enable color correction with lcms" OFF)
+OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
+OPTION(WITH_BUILDINFO     "Include extra build details" ON)
+OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
+OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
+OPTION(WITH_PLAYER        "Build Player" OFF)
+# (unix defaults to OpenMP On)
+IF(UNIX AND NOT APPLE)
+	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+ELSE()
+	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+ENDIF()
+
+# Image format support
+OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_TIFF          "Enable LibTIFF Support" ON)
+OPTION(WITH_DDS           "Enable DDS Support" ON)
+
+# Audio format support
+OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
+OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
+IF(APPLE OR WIN32)
+	OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
+ENDIF(APPLE OR WIN32)
+
+# 3D format support
+# disable opencollada on non-apple unix because opencollada has no package for debian
+IF(UNIX AND NOT APPLE)
+	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
+ELSE()
+	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
+ENDIF()
+
+# Sound output
+OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
+OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+
+# Compression
+OPTION(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
+OPTION(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
+
+# Misc
+OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
+OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
+OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
+
+IF(APPLE)
+	OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
+	OPTION(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
+	OPTION(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
+ENDIF(APPLE)
+
+IF(NOT WITH_BULLET AND WITH_GAMEENGINE)
+	MESSAGE("WARNING: WITH_GAMEENGINE needs WITH_BULLET")
+ENDIF(NOT WITH_BULLET AND WITH_GAMEENGINE)
+
+IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
+ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+
+TEST_SSE_SUPPORT()
+
+# disabled for now, not supported
+# OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
+
+# 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/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
+# On Macs: 
+#   cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config -G Xcode ../blender
+#
+# When changing any of this remember to update the notes in doc/blender-cmake.txt
+
+#-----------------------------------------------------------------------------
+#Platform specifics
+
+IF(UNIX AND NOT APPLE)
+
+	IF(WITH_OPENAL)
+		FIND_PACKAGE(OpenAL)
+		IF(NOT OPENAL_FOUND)
+			SET(WITH_OPENAL OFF)
+		ENDIF(NOT OPENAL_FOUND)
+	ENDIF(WITH_OPENAL)
+
+	IF(WITH_JACK)
+		SET(JACK /usr)
+		SET(JACK_INC ${JACK}/include/jack)
+		SET(JACK_LIB jack)
+		SET(JACK_LIBPATH ${JACK}/lib)
+	ENDIF(WITH_JACK)
+
+	IF(WITH_SNDFILE)
+	SET(SNDFILE /usr)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+	ENDIF(WITH_SNDFILE)
+
+	IF(WITH_INTERNATIONAL)
+		FIND_LIBRARY(INTL_LIBRARY
+			NAMES intl
+			PATHS
+			/sw/lib
+		)
+
+		FIND_LIBRARY(ICONV_LIBRARY
+			NAMES iconv
+			PATHS
+			/sw/lib
+		)
+
+		IF(INTL_LIBRARY AND ICONV_LIBRARY)
+			SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+		ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+	ENDIF(WITH_INTERNATIONAL)
+
+	FIND_PACKAGE(Freetype)
+	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
+
+
+	IF(WITH_PYTHON)
+		# No way to set py31. remove for now.
+		# FIND_PACKAGE(PythonLibs)
+		SET(PYTHON /usr)
+		SET(PYTHON_VERSION 3.1)
+		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+		# SET(PYTHON_BINARY python) # not used yet
+		SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+		SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+	
+		# FIND_PACKAGE(PythonInterp) # not used yet
+		# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+
+		SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+	ENDIF(WITH_PYTHON)
+
+	IF(WITH_SDL)
+		FIND_PACKAGE(SDL)
+		# UNSET(SDLMAIN_LIBRARY CACHE)
+		IF(NOT SDL_FOUND)
+			SET(WITH_SDL OFF)
+		ENDIF(NOT SDL_FOUND)
+	ENDIF(WITH_SDL)
+
+	IF(WITH_OPENEXR)
+		SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
+		FIND_PATH(OPENEXR_INC
+			ImfXdr.h
+			PATHS
+			${OPENEXR}/include/OpenEXR
+			/usr/local/include/OpenEXR
+			/sw/include/OpenEXR
+			/opt/local/include/OpenEXR
+			/opt/csw/include/OpenEXR
+			/opt/include/OpenEXR
+		)
+		SET(OPENEXR_LIB Half IlmImf Iex Imath)
+		
+		IF(NOT OPENEXR_INC)
+			SET(WITH_OPENEXR OFF)
+		ENDIF(NOT OPENEXR_INC)
+	ENDIF(WITH_OPENEXR)
+
+	IF(WITH_TIFF)
+		FIND_PACKAGE(TIFF)
+		IF(NOT TIFF_FOUND)
+			SET(WITH_TIFF OFF)
+		ENDIF(NOT TIFF_FOUND)
+	ENDIF(WITH_TIFF)
+
+	FIND_PACKAGE(JPEG REQUIRED)
+
+	FIND_PACKAGE(PNG REQUIRED)
+
+	FIND_PACKAGE(ZLIB REQUIRED)
+
+	IF(WITH_LCMS)
+		SET(LCMS /usr CACHE FILEPATH "LCMS directory")
+		SET(LCMS_INCLUDE_DIR ${LCMS}/include)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list