diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-11-06 05:45:15 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-11-06 05:45:15 +0400 |
commit | 99c5e713970859640a9e46c2afeeff9d5235f624 (patch) | |
tree | dd9a6ba6d4cb49a6db9f2ddf3d6552ea5496f3e4 /CMakeLists.txt | |
parent | 299812f28d32950a9bbf4612a3a5fef46054e7fb (diff) |
Quicktime: remove backend with the old quicktime API, and keep the QTKit backend.
This means that if you have WITH_BF_QUICKTIME or WITH_CODEC_QUICKTIME enabled,
it will always use QTKit.
The old backend was only used on 32 bit OS X builds, now 32 and 64 bit builds will
give consistent input/output. On Windows or Linux quicktime isn't being used.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1302fd5bdfa..f9ba78eab53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,7 +218,7 @@ option(WITH_CODEC_AVI "Enable Blenders own AVI file support (raw/jpeg) 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)) +if(APPLE) option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF) endif() @@ -380,11 +380,7 @@ if(APPLE) add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") endif() - 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) - if(CMAKE_OSX_ARCHITECTURES MATCHES x86_64) - set(USE_QTKIT ON CACHE BOOL "ON" FORCE) # no Quicktime in 64bit - endif() endif() @@ -491,14 +487,6 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS) set(WITH_X11_XINPUT OFF) endif() -if(MINGW) - if(WITH_CODEC_QUICKTIME) - message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF " - "because it is currently unsupported, remove this " - "line if youre a developer who wants to add support.") - endif() -endif() - TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG) TEST_STDBOOL_SUPPORT() @@ -1029,13 +1017,6 @@ elseif(WIN32) set(SDL_LIBPATH ${SDL}/lib) endif() - if(WITH_CODEC_QUICKTIME) - set(QUICKTIME ${LIBDIR}/QTDevWin) - set(QUICKTIME_INCLUDE_DIRS ${QUICKTIME}/CIncludes) - set(QUICKTIME_LIBRARIES qtmlClient) - set(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries) - endif() - if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) add_definitions(-D__SSE__ -D__MMX__) endif() @@ -1613,15 +1594,12 @@ elseif(APPLE) set(PLATFORM_CFLAGS "-pipe -funsigned-char") 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") + if(WITH_CODEC_QUICKTIME) 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 endif() - elseif(WITH_CODEC_QUICKTIME) - set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime") endif() # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED! |