diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-22 16:51:29 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-22 16:51:29 +0300 |
| commit | 851201353621d053552dda1e92bf3f7d305e30f0 (patch) | |
| tree | e0b4d233647ecbf4136df5bd33a69612a63415d5 /CMakeLists.txt | |
| parent | b91beefdb7f2def2fa7a0a18bc39902c45c72076 (diff) | |
| parent | 8b84cc2ab65790604722eeaba89a34095d2e7259 (diff) | |
COLLADA branch: merge from trunk -r 24522:24758.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index db9e5948f33..14510cbeecd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,6 @@ OPTION(WITH_PYTHON "Enable Embedded Python API" ON) OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON) OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF) OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) -OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF) OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF) OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF) OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF) @@ -82,9 +81,17 @@ 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/)" 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) @@ -236,7 +243,7 @@ IF(UNIX AND NOT APPLE) ENDIF(WITH_OPENMP) - SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts") + SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts") SET(PLATFORM_LINKFLAGS "-pthread") @@ -525,7 +532,15 @@ IF(APPLE) IF (WITH_COCOA) SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DGHOST_COCOA") - SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime") + SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio") + IF(USE_QTKIT) + SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT") + SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit") + ELSE(USE_QTKIT) + IF(WITH_QUICKTIME) + SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime") + ENDIF(WITH_QUICKTIME) + ENDIF(USE_QTKIT) ELSE (WITH_COCOA) SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime") |