Cycles: svn merge -r37904:37957 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 29 Jun 2011 19:14:37 +0000 (19:14 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 29 Jun 2011 19:14:37 +0000 (19:14 +0000)
1  2 
CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c

diff --combined CMakeLists.txt
index 3b74bb00260103871567d5ae2c0275be980a7a63,24a6f263b426acb5f073287967143828e17d35bd..8c865b701d8534e644c891f8da9bfe14899fcd73
@@@ -53,11 -53,6 +53,6 @@@ if(NOT EXECUTABLE_OUTPUT_PATH
        set(FIRST_RUN "TRUE")
  endif()
  
- # set default build type to Release
- if(NOT CMAKE_BUILD_TYPE)
-       set(CMAKE_BUILD_TYPE "Release")
- endif()
  # this starts out unset
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
  
@@@ -88,7 -83,6 +83,7 @@@ enable_testing(
  
  set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
  set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
 +set(INCLUDE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/include CACHE INTERNAL "" FORCE )
  
  #-----------------------------------------------------------------------------
  # Set default config options
@@@ -150,7 -144,7 +145,7 @@@ option(WITH_IMAGE_HDR           "Enabl
  option(WITH_IMAGE_REDCODE       "Enable RedCode Image Support" OFF)
  
  # Audio/Video format support
- option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF)
+ option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
  option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
  if(APPLE OR (WIN32 AND NOT UNIX))
        option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)
@@@ -176,10 -170,6 +171,10 @@@ if(UNIX AND NOT APPLE
        option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
  endif()
  option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 +option(WITH_API_INSTALL     "Copy API header files into the blender install folder" ON)
 +
 +# Cycles
 +option(WITH_CYCLES                    "Enable Cycles Render Engine" ON)
  
  # disable for now, but plan to support on all platforms eventually
  option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@@ -372,7 -362,7 +367,7 @@@ if(UNIX AND NOT APPLE
        endif()
  
        if(WITH_CODEC_FFMPEG)
-               set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
+               set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
                mark_as_advanced(FFMPEG)
                set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
                set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
        endif()
  
        if(WITH_OPENCOLLADA)
-               set(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
+               set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory")
                mark_as_advanced(OPENCOLLADA)
                set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
                set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
                set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
  
-               set(PCRE /usr CACHE FILEPATH "PCRE Directory")
+               set(PCRE /usr CACHE PATH "PCRE Directory")
                mark_as_advanced(PCRE)
                set(PCRE_LIBPATH ${PCRE}/lib)
                set(PCRE_LIB pcre)
  
-               set(EXPAT /usr CACHE FILEPATH "Expat Directory")
+               set(EXPAT /usr CACHE PATH "Expat Directory")
                mark_as_advanced(EXPAT)
                set(EXPAT_LIBPATH ${EXPAT}/lib)
                set(EXPAT_LIB expat)
@@@ -624,9 -614,10 +619,10 @@@ elseif(WIN32
                set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
                set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
  
+               set(FREETYPE ${LIBDIR}/freetype)
                set(FREETYPE_INCLUDE_DIRS
-                       ${FREETYPE}/include
-                       ${FREETYPE}/include/freetype2
+                       ${LIBDIR}/freetype/include
+                       ${LIBDIR}/freetype/include/freetype2
                )
                set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
  
@@@ -1224,19 -1215,13 +1220,19 @@@ add_subdirectory(extern
  # Blender Application
  add_subdirectory(source/creator)
  
 -
  #-----------------------------------------------------------------------------
  # Blender Player
  if(WITH_PLAYER)
        add_subdirectory(source/blenderplayer)
  endif()
  
 +#-----------------------------------------------------------------------------
 +# Cycles
 +
 +if(WITH_CYCLES)
 +      add_subdirectory(intern/cycles)
 +endif()
 +
  #-----------------------------------------------------------------------------
  # CPack for generating packages
  include(build_files/cmake/packaging.cmake)
index a3bd6d91a635548ceccf3a16bae57755ae04985a,e496fa0fa8c0bf3ed4a1a1756d0e84938fb1eedc..5629f0d9668d01a607b35dc4d53f353f83e7d236
@@@ -377,8 -377,7 +377,9 @@@ void RE_AcquireResultImage(struct Rende
  void RE_ReleaseResult(struct Render *re){}
  void RE_ReleaseResultImage(struct Render *re){}
  int RE_engine_test_break(struct RenderEngine *engine){return 0;}
 +void RE_engines_init() {}
 +void RE_engines_exit() {}
+ void RE_engine_report(struct RenderEngine *engine, int type, const char *msg) {}
  
  /* python */
  struct wmOperatorType *WM_operatortype_find(const char *idname, int quiet){return (struct wmOperatorType *) NULL;}