Revision: 40873
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40873
Author: campbellbarton
Date: 2011-10-09 07:31:15 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40720:40872
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40720
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/SConstruct
branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
branches/bmesh/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/bmesh/blender/build_files/cmake/config/blender_headless.cmake
branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake
branches/bmesh/blender/build_files/cmake/config/bpy_module.cmake
branches/bmesh/blender/build_files/cmake/macros.cmake
branches/bmesh/blender/build_files/package_spec/debian/control
branches/bmesh/blender/build_files/package_spec/pacman/PKGBUILD
branches/bmesh/blender/build_files/scons/config/darwin-config.py
branches/bmesh/blender/build_files/scons/config/freebsd7-config.py
branches/bmesh/blender/build_files/scons/config/freebsd8-config.py
branches/bmesh/blender/build_files/scons/config/freebsd9-config.py
branches/bmesh/blender/build_files/scons/config/linux-config.py
branches/bmesh/blender/build_files/scons/config/linuxcross-config.py
branches/bmesh/blender/build_files/scons/config/openbsd3-config.py
branches/bmesh/blender/build_files/scons/config/sunos5-config.py
branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/doc/python_api/examples/aud.py
branches/bmesh/blender/doc/python_api/rst/change_log.rst
branches/bmesh/blender/doc/python_api/sphinx_changelog_gen.py
branches/bmesh/blender/intern/audaspace/CMakeLists.txt
branches/bmesh/blender/intern/audaspace/SConscript
branches/bmesh/blender/intern/container/CTR_List.h
branches/bmesh/blender/intern/container/CTR_Map.h
branches/bmesh/blender/intern/ghost/GHOST_Types.h
branches/bmesh/blender/intern/ghost/SConscript
branches/bmesh/blender/intern/ghost/intern/GHOST_Buttons.h
branches/bmesh/blender/intern/ghost/intern/GHOST_ModifierKeys.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/bmesh/blender/intern/ghost/intern/GHOST_TaskbarWin32.h
branches/bmesh/blender/intern/ghost/intern/GHOST_Window.h
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.h
branches/bmesh/blender/intern/ghost/test/gears/GHOST_C-Test.c
branches/bmesh/blender/intern/mikktspace/mikktspace.c
branches/bmesh/blender/intern/string/STR_String.h
branches/bmesh/blender/po/clean_po.py
branches/bmesh/blender/po/fr.po
branches/bmesh/blender/po/merge_po.py
branches/bmesh/blender/po/update_msg.py
branches/bmesh/blender/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/bmesh/blender/release/scripts/modules/bpy/ops.py
branches/bmesh/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object_align.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object_quick_effects.py
branches/bmesh/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/release/scripts/startup/keyingsets_builtins.py
branches/bmesh/blender/release/text/readme.html
branches/bmesh/blender/source/blender/blenfont/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/blenkernel/BKE_font.h
branches/bmesh/blender/source/blender/blenkernel/BKE_material.h
branches/bmesh/blender/source/blender/blenkernel/BKE_packedFile.h
branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c
branches/bmesh/blender/source/blender/blenkernel/intern/colortools.c
branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
branches/bmesh/blender/source/blender/blenkernel/intern/font.c
branches/bmesh/blender/source/blender/blenkernel/intern/gpencil.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/library.c
branches/bmesh/blender/source/blender/blenkernel/intern/material.c
branches/bmesh/blender/source/blender/blenkernel/intern/nla.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenkernel/intern/packedFile.c
branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/blenlib/intern/winstuff.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/animation/anim_draw.c
branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.c
branches/bmesh/blender/source/blender/editors/curve/editfont.c
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_intern.h
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/render/render_preview.c
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/sound/sound_ops.c
branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_context.c
branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
branches/bmesh/blender/source/blender/editors/space_file/filesel.c
branches/bmesh/blender/source/blender/editors/space_file/space_file.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/editors/util/ed_util.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/makesdna/intern/dna_genfile.c
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/RNA_define.h
branches/bmesh/blender/source/blender/makesrna/RNA_types.h
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_armature.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_cloth.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_color.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_fcurve.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_group.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_image_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_internal_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_key.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_lattice.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_main.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_main_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_meta.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_render.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_rna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.c
branches/bmesh/blender/source/blender/python/intern/bpy_app_handlers.c
branches/bmesh/blender/source/blender/python/intern/bpy_driver.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator_wrap.c
branches/bmesh/blender/source/blender/python/intern/bpy_props.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna_anim.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils.c
branches/bmesh/blender/source/blender/quicktime/SConscript
branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/gameengine/Converter/BlenderWorldInfo.h
branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_Dome.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_Dome.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_OrientationInterpolator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_SteeringActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/bmesh/blender/source/gameengine/SceneGraph/SG_DList.h
branches/bmesh/blender/source/gameengine/VideoTexture/ImageRender.h
branches/bmesh/blender/source/gameengine/VideoTexture/ImageViewport.h
branches/bmesh/blender/source/tools/MakeGLStipple.py
Added Paths:
-----------
branches/bmesh/blender/source/tools/compile_scripts.py
Removed Paths:
-------------
branches/bmesh/blender/build_files/cmake/Modules/FindSamplerate.cmake
branches/bmesh/blender/doc/python_api/blender_api_40524.py
branches/bmesh/blender/release/bin/.blender/.Blanguages
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/po/check_po.py
branches/bmesh/blender/po/clean_po.py
branches/bmesh/blender/po/merge_po.py
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-40720
+ /trunk/blender:39992-40872
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-10-09 06:03:38 UTC (rev
40872)
+++ branches/bmesh/blender/CMakeLists.txt 2011-10-09 07:31:15 UTC (rev
40873)
@@ -26,8 +26,8 @@
# ***** 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
+# 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.
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
@@ -189,7 +189,6 @@
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)
-option(WITH_SAMPLERATE "Enable samplerate conversion" ON)
# Compression
option(WITH_LZO "Enable fast LZO compression (used for pointcache)"
ON)
@@ -197,7 +196,7 @@
# Misc
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and
friends)" ON)
-option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the
raytracer" ON)
+option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the
raytracer" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime,
otherwise install into CMAKE_INSTALL_PREFIX" ON)
endif()
@@ -273,7 +272,7 @@
set(WITH_HEADLESS ON)
endif()
-TEST_SSE_SUPPORT()
+TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
# don't store paths to libs for portable distrobution
if(WITH_INSTALL_PORTABLE)
@@ -286,8 +285,8 @@
# linux only, not cached
set(WITH_BINRELOC OFF)
-# MAXOSX only, set to avoid uninitialized
-set(EXETYPE)
+# MAXOSX only, set to avoid uninitialized
+set(EXETYPE "")
# C/C++ flags
set(PLATFORM_CFLAGS)
@@ -298,26 +297,26 @@
# libraries to link the binary with passed to target_link_libraries()
# known as LLIBS to scons
-set(PLATFORM_LINKLIBS)
+set(PLATFORM_LINKLIBS "")
# Added to linker flags in setup_liblinks
# - CMAKE_EXE_LINKER_FLAGS
# - CMAKE_EXE_LINKER_FLAGS_DEBUG
-set(PLATFORM_LINKFLAGS)
-set(PLATFORM_LINKFLAGS_DEBUG)
+set(PLATFORM_LINKFLAGS "")
+set(PLATFORM_LINKFLAGS_DEBUG "")
# 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:
+# On Unix:
# cmake ../blender \
# -D PYTHON_VERSION=3.2 \
# -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \
# -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so
#
-# On Macs:
+# On Macs:
# cmake ../blender \
# -D
PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2
\
# -D
PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config
\
@@ -329,7 +328,7 @@
#Platform specifics
if(UNIX AND NOT APPLE)
-
+
# needed for ubuntu 11.04
if(EXISTS "/usr/lib/x86_64-linux-gnu")
set(CMAKE_LIBRARY_PATH
"/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
@@ -381,10 +380,12 @@
if(WITH_SDL)
find_package(SDL)
- mark_as_advanced(SDLMAIN_LIBRARY)
- mark_as_advanced(SDL_INCLUDE_DIR)
- mark_as_advanced(SDL_LIBRARY)
- mark_as_advanced(SDL_LIBRARY_TEMP)
+ mark_as_advanced(
+ SDLMAIN_LIBRARY
+ SDL_INCLUDE_DIR
+ SDL_LIBRARY
+ SDL_LIBRARY_TEMP
+ )
# unset(SDLMAIN_LIBRARY CACHE)
if(NOT SDL_FOUND)
set(WITH_SDL OFF)
@@ -428,11 +429,13 @@
PATHS
/sw/lib
)
- mark_as_advanced(ICONV_LIBRARY)
- mark_as_advanced(INTL_LIBRARY)
+ mark_as_advanced(
+ ICONV_LIBRARY
+ INTL_LIBRARY
+ )
if(INTL_LIBRARY AND ICONV_LIBRARY)
- set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+ set(GETTEXT_LIBRARIES ${INTL_LIBRARY} ${ICONV_LIBRARY})
endif()
endif()
@@ -443,13 +446,6 @@
endif()
endif()
- if(WITH_SAMPLERATE)
- find_package(Samplerate)
- if(NOT SAMPLERATE_FOUND)
- set(WITH_SAMPLERATE OFF)
- endif()
- endif()
-
if(WITH_OPENCOLLADA)
find_package(OpenCOLLADA)
if(OPENCOLLADA_FOUND)
@@ -519,16 +515,16 @@
# Intel C++ Compiler
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
# think these next two are broken
- find_program(XIAR xiar)
- if(XIAR)
+ find_program(XIAR xiar)
+ if(XIAR)
set(CMAKE_AR "${XIAR}")
- endif()
+ endif()
mark_as_advanced(XIAR)
- find_program(XILD xild)
- if(XILD)
+ find_program(XILD xild)
+ if(XILD)
set(CMAKE_LINKER "${XILD}")
- endif()
+ endif()
mark_as_advanced(XILD)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fp-model precise -prec_div
-parallel")
@@ -551,7 +547,7 @@
message("64 bit compiler detected.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
endif()
-
+
add_definitions(-DWIN32)
if(WITH_INTERNATIONAL)
@@ -561,13 +557,6 @@
set(ICONV_LIBPATH ${ICONV}/lib)
endif()
- if(WITH_SAMPLERATE)
- set(SAMPLERATE ${LIBDIR}/samplerate)
- set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
- set(SAMPLERATE_LIBRARIES libsamplerate)
- set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
- endif()
-
set(PNG "${LIBDIR}/png")
set(PNG_INCLUDE_DIR "${PNG}/include")
set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
@@ -576,7 +565,7 @@
set(JPEG_INCLUDE_DIR "${JPEG}/include")
set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
- set(WINTAB_INC ${LIBDIR}/wintab/include)
+ set(WINTAB_INC ${LIBDIR}/wintab/include)
if(WITH_OPENAL)
set(OPENAL ${LIBDIR}/openal)
@@ -641,9 +630,9 @@
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gettext)
- set(GETTEXT_INC ${GETTEXT}/include)
+ set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
- set(GETTEXT_LIB gnu_gettext)
+ set(GETTEXT_LIBRARIES gnu_gettext)
endif()
if(CMAKE_CL_64)
@@ -684,7 +673,7 @@
${LIBDIR}/opencollada/include/COLLADABaseUtils/include
${LIBDIR}/opencollada/include/COLLADAFramework/include
${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
-
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
+
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
set(OPENCOLLADA_LIBRARIES
@@ -741,7 +730,7 @@
set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
set(OPENEXR_INCLUDE_DIRS
${OPENEXR_INCUDE}
- ${OPENEXR_INCUDE}/IlmImf
+ ${OPENEXR_INCUDE}/IlmImf
${OPENEXR_INCUDE}/Iex
${OPENEXR_INCUDE}/Imath
)
@@ -800,9 +789,9 @@
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gcc/gettext)
- set(GETTEXT_INC ${GETTEXT}/include)
+ set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
- set(GETTEXT_LIB intl)
+ set(GETTEXT_LIBRARIES intl)
endif()
set(JPEG_LIBRARIES libjpeg)
@@ -817,7 +806,7 @@
set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
set(PTHREADS_LIBPATH ${PTHREADS}/lib)
set(PTHREADS_LIBRARIES pthreadGC2)
-
+
set(FREETYPE ${LIBDIR}/gcc/freetype)
set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include
${FREETYPE}/include/freetype2)
set(FREETYPE_LIBPATH ${FREETYPE}/lib)
@@ -837,13 +826,13 @@
${LIBDIR}/gcc/opencollada/include/COLLADABaseUtils/include
${LIBDIR}/gcc/opencollada/include/COLLADAFramework/include
${LIBDIR}/gcc/opencollada/include/COLLADASaxFrameworkLoader/include
-
${LIBDIR}/gcc/opencollada/include/GeneratedSaxParser/include
+
${LIBDIR}/gcc/opencollada/include/GeneratedSaxParser/include
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib
${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter
OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils
GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
set(PCRE_LIBRARIES pcre)
endif()
-
+
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include
${FFMPEG}/include)
@@ -870,7 +859,7 @@
set(JACK_INCLUDE_DIRS ${JACK}/include/jack
${JACK}/include)
set(JACK_LIBRARIES jack)
set(JACK_LIBPATH ${JACK}/lib)
-
+
# TODO, gives linking errors, force off
set(WITH_JACK OFF)
endif()
@@ -908,8 +897,8 @@
set(LIBDIR
${CMAKE_SOURCE_DIR}/../lib/darwin-8.0.0-powerpc)
endif()
endif()
-
+
if(WITH_OPENAL)
find_package(OpenAL)
if(OPENAL_FOUND)
@@ -952,8 +941,8 @@
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gettext)
- set(GETTEXT_INC "${GETTEXT}/include")
- set(GETTEXT_LIB intl iconv)
+ set(GETTEXT_INCLUDE_DIRS "${GETTEXT}/include")
+ set(GETTEXT_LIBRARIES intl iconv)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
endif()
@@ -991,16 +980,9 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
-D__STDC_CONSTANT_MACROS")
endif()
- if(WITH_SAMPLERATE)
- set(SAMPLERATE ${LIBDIR}/samplerate)
- set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
- set(SAMPLERATE_LIBRARIES samplerate)
- set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
- endif()
-
- find_library(SYSTEMSTUBS_LIBRARY
- NAMES
- SystemStubs
+ find_library(SYSTEMSTUBS_LIBRARY
+ NAMES
+ SystemStubs
PATHS
)
mark_as_advanced(SYSTEMSTUBS_LIBRARY)
@@ -1018,13 +1000,13 @@
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS}
-framework QTKit")
if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS}
-framework QuickTime")
- #libSDL still needs 32bit carbon quicktime
+ #libSDL still needs 32bit carbon quicktime
endif()
elseif(WITH_CODEC_QUICKTIME)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS}
-framework QuickTime")
endif()
- # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
+ # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
# ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
if(WITH_INPUT_NDOF)
# This thread it *should* work and check the framework
- campbell
@@ -1101,11 +1083,11 @@
set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
set(CMAKE_CXX_FLAGS_DEBUG "-fno-strict-aliasing -g")
if(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -mdynamic-no-pic
-ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
