COLLADA branch: merge from trunk -r 24522:24758.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 22 Nov 2009 13:51:29 +0000 (13:51 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 22 Nov 2009 13:51:29 +0000 (13:51 +0000)
1  2 
CMakeLists.txt
config/linux2-config.py
source/blender/windowmanager/intern/wm_operators.c
tools/Blender.py

diff --cc CMakeLists.txt
index db9e5948f33846c5f36a0a9122ce403b62602e71,c7e08d7b1ba8840617fa745572971b9486106a08..14510cbeecdd6c8a4ad37aeba5b1c786407e318c
@@@ -80,11 -79,19 +79,19 @@@ OPTION(WITH_LZMA          "Enable best 
  OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
  OPTION(WITH_BUILDINFO     "Include extra build details" ON)
  OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 -OPTION(WITH_OPENCOLLADA               "Enable OpenCollada Support (http://www.opencollada.org/)"      OFF)
 +OPTION(WITH_OPENCOLLADA               "Enable OpenCollada Support (http://www.opencollada.org/)"      ON)
  
+ # Unix defaults to OpenMP On
+ IF (UNIX)
+       OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+ ELSE(UNIX)
+       OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+ ENDIF(UNIX)
  IF (APPLE)
- OPTION(WITH_COCOA       "Use Cocoa framework instead of deprecated Carbon" ON)
- OPTION(WITH_LIBS10.5    "Use 10.5 libs (needed for 64bit builds)" OFF)
+       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_GAMEENGINE AND WITH_PLAYER)
Simple merge
Simple merge