Merging r48196 through r48223 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 23 Jun 2012 18:08:56 +0000 (18:08 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 23 Jun 2012 18:08:56 +0000 (18:08 +0000)
1  2 
CMakeLists.txt
build_files/cmake/macros.cmake
source/blender/makesrna/intern/rna_nodetree.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
@@@ -193,10 -193,7 +193,10 @@@ macro(SETUP_LIBDIRS
        if(WITH_OPENIMAGEIO)
                link_directories(${OPENIMAGEIO_LIBPATH})
        endif()
-       if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
 +      if(WITH_OPENCOLORIO)
 +              link_directories(${OPENCOLORIO_LIBPATH})
 +      endif()
+       if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
                link_directories(${OPENJPEG_LIBPATH})
        endif()
        if(WITH_CODEC_QUICKTIME)
Simple merge
Simple merge