diff options
author | Matt Ebb <matt@mke3.net> | 2007-12-29 08:29:08 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2007-12-29 08:29:08 +0300 |
commit | 96935a6c5d35974e08604a9c338b8dcd06a7b9f8 (patch) | |
tree | 192fab84671c40808b1680674d5a4ac621416f5d /CMakeLists.txt | |
parent | 3c1ad6a295af33ee97847d80ff1e007369bdf96f (diff) |
Reverting mistaken CMakeLists.txt commit, woops!
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 78418d18888..0227c51f39d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,16 +57,16 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) #----------------------------------------------------------------------------- # Set default config options OPTION(WITH_PLAYER "Build Player" OFF) -OPTION(WITH_GAMEENGINE "Enable Game Engine" OFF) -OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" OFF) +OPTION(WITH_GAMEENGINE "Enable Game Engine" ON) +OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON) OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON) OPTION(WITH_VERSE "Enable Verse (http://verse.blender.org)" OFF) OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON) -OPTION(WITH_QUICKTIME "Enable Quicktime Support" ON) -OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) +OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF) +OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" OFF) OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF) -OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) -OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" ON) +OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) +OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF) IF(NOT WITH_GAMEENGINE AND WITH_PLAYER) MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE") @@ -299,28 +299,22 @@ IF(APPLE) SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc) ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386) - #INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake) - #IF(OPENAL_FOUND) - # SET(WITH_OPENAL ON) - # SET(OPENAL_LIB ${OPENAL_LIBRARY}) - # SET(OPENAL_INC ${OPENAL_INCLUDE_DIR}) - #ELSE(OPENAL_FOUND) - # SET(WITH_OPENAL OFF) - #ENDIF(OPENAL_FOUND) - - SET(WITH_OPENAL ON) - SET(OPENAL ${LIBDIR}/openal) - SET(OPENAL_INC ${OPENAL}/include) - SET(OPENAL_LIBPATH ${OPENAL}/lib) - SET(OPENAL_LIB openal) + INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake) + IF(OPENAL_FOUND) + SET(WITH_OPENAL ON) + SET(OPENAL_LIB ${OPENAL_LIBRARY}) + SET(OPENAL_INC ${OPENAL_INCLUDE_DIR}) + ELSE(OPENAL_FOUND) + SET(WITH_OPENAL OFF) + ENDIF(OPENAL_FOUND) SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/) - SET(PYTHON_VERSION 2.5) + SET(PYTHON_VERSION 2.3) SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "") SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") SET(PYTHON_LIB "") SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "") - SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python") + SET(PYTHON_LINKFLAGS "-u __dummy -u _PyMac_Error -framework System -framework Python") SET(GETTEXT ${LIBDIR}/gettext) SET(GETTEXT_INC "${GETTEXT}/include") |