diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-13 10:04:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-13 10:04:54 +0400 |
| commit | 44e45e54c51e2f54c89b173e8844a99ce7f5de75 (patch) | |
| tree | 783c5cfff30003194857f5ae061fb1eb27f41c1e /CMakeLists.txt | |
| parent | 0fc6aac3dc133c2a06aa44866b9d45abb7d54b45 (diff) | |
- don't build ghost's event printer unless ghost debug is enabled.
- use char rather then STR_String for the event printer.
- added option to build WITH_GHOST_DEBUG for cmake
- renamed WITH_SDL_GHOST --> WITH_GHOST_SDL
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b583a8a15e..dc42a4a7e75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,15 +106,21 @@ option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) option(WITH_GAMEENGINE "Enable Game Engine" ON) option(WITH_PLAYER "Build Player" OFF) -option(WITH_AUDASPACE "Build with blenders audio library" ON) -mark_as_advanced(WITH_AUDASPACE) +# GHOST Windowing Library Options +option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF) +mark_as_advanced(WITH_GHOST_DEBUG) -option(WITH_SDL_GHOST "Enable building blender against SDL for windowing rather then the native APIs" OFF) -mark_as_advanced(WITH_SDL_GHOST) +option(WITH_GHOST_SDL "Enable building blender against SDL for windowing rather then the native APIs" OFF) +mark_as_advanced(WITH_GHOST_SDL) +# Misc... option(WITH_HEADLESS "Build without graphical support (renderfarm, server mode only)" OFF) mark_as_advanced(WITH_HEADLESS) +option(WITH_AUDASPACE "Build with blenders audio library (only disable if you know what you're doing!)" ON) +mark_as_advanced(WITH_AUDASPACE) + + # (unix defaults to OpenMP On) if(UNIX AND NOT APPLE) option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON) @@ -212,8 +218,8 @@ if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK)) message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE") endif() -if(NOT WITH_SDL AND WITH_SDL_GHOST) - message(FATAL_ERROR "WITH_SDL_GHOST requires WITH_SDL to be ON") +if(NOT WITH_SDL AND WITH_GHOST_SDL) + message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON") endif() if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE) @@ -440,7 +446,7 @@ if(UNIX AND NOT APPLE) # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++") - if((NOT WITH_HEADLESS) AND (NOT WITH_SDL_GHOST)) + if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL)) find_package(X11 REQUIRED) find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH}) mark_as_advanced(X11_XF86keysym_INCLUDE_PATH) |