readfile.c - fixed a indentention on a few lines
[blender.git] / CMakeLists.txt
index e1f585fcc740868a06cd5ce62cadb3c5a5471e2c..7f513b8028f420a5d4cb7c7ee1ed2ed2212f70da 100644 (file)
@@ -66,6 +66,7 @@ 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"                                  OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -143,6 +144,7 @@ IF(UNIX)
     /opt/local/include/freetype2
     /opt/csw/include/freetype2
     /opt/include/freetype2
+    NO_DEFAULT_PATH
   )
   SET(FREETYPE_LIB freetype)
 
@@ -195,10 +197,10 @@ IF(WIN32)
   SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
 
   SET(PYTHON ${LIBDIR}/python)
-  SET(PYTHON_VERSION 2.4)
+  SET(PYTHON_VERSION 2.5)
   SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
   SET(PYTHON_BINARY python)
-  SET(PYTHON_LIB python24)
+  SET(PYTHON_LIB python25)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
   #SET(WITH_OPENAL ON)
@@ -237,7 +239,7 @@ IF(WIN32)
   
   SET(OPENEXR ${LIBDIR}/openexr)
   SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
-  SET(OPENEXR_LIB Iex Half IlmImf Imath)
+  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
   SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
   
   SET(QUICKTIME ${LIBDIR}/QTDevWin)