diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-09-30 12:47:39 +0400 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-09-30 12:47:39 +0400 |
| commit | 570c187ba1289c2515ee9db499ecf8c18f0d0b72 (patch) | |
| tree | 601338952b62b32e3cfe7f42d31ce59070aeaf8c /CMakeLists.txt | |
| parent | 2a21c1acbef1920a7bf177974119800c23a993c7 (diff) | |
Cocoa port start:
GHOST*Cocoa.mm & .h files creation
First Cocoa version of GHOST_SystemCocoa.mm
CMake files update to allow optional (WITH_COCOA option) Cocoa version build - disabled by default
SCons files are not updated to allow Cocoa build (the ghost .mm files)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d8c5a132995..d53f4ed9966 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,10 @@ 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) +IF (APPLE) +OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" OFF) +ENDIF (APPLE) + IF(NOT WITH_GAMEENGINE AND WITH_PLAYER) MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE") ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER) @@ -402,6 +406,7 @@ IF(APPLE) FIND_PACKAGE(OpenAL) IF(OPENAL_FOUND) SET(WITH_OPENAL ON) + SET(OPENAL_INCLUDE_DIR "${OPENAL_INCLUDE_DIR};${LIBDIR}/openal/include") ELSE(OPENAL_FOUND) SET(WITH_OPENAL OFF) ENDIF(OPENAL_FOUND) @@ -485,9 +490,13 @@ IF(APPLE) SET(LLIBS stdc++ SystemStubs) + 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") + 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") - + ENDIF (WITH_COCOA) IF(WITH_OPENMP) SET(LLIBS "${LLIBS} -lgomp ") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ") |