svn merge -r 20373:20515 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender-staging.git] / CMakeLists.txt
index 45caf48091b08b9389aac97efafb792747b7e29c..f2bf65dfb57545e1645d3b6077e166625c087c08 100644 (file)
@@ -223,11 +223,15 @@ IF(WIN32)
   SET(PYTHON_LIB python25)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
   SET(PYTHON_LIB python25)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
-  #SET(WITH_OPENAL ON)
-  SET(OPENAL ${LIBDIR}/openal)
-  SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
-  SET(OPENAL_LIB openal_static)
-  SET(OPENAL_LIBPATH ${OPENAL}/lib)
+  IF(CMAKE_CL_64)
+    SET(WITH_OPENAL OFF)
+  ELSE(CMAKE_CL_64)
+    #SET(WITH_OPENAL ON)
+    SET(OPENAL ${LIBDIR}/openal)
+    SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
+    SET(OPENAL_LIB openal_static)
+    SET(OPENAL_LIBPATH ${OPENAL}/lib)
+  ENDIF(CMAKE_CL_64)
 
   IF(CMAKE_CL_64)
        SET(PNG_LIB libpng)
 
   IF(CMAKE_CL_64)
        SET(PNG_LIB libpng)
@@ -238,11 +242,7 @@ IF(WIN32)
 
   SET(ZLIB ${LIBDIR}/zlib)
   SET(ZLIB_INC ${ZLIB}/include)
 
   SET(ZLIB ${LIBDIR}/zlib)
   SET(ZLIB_INC ${ZLIB}/include)
-  IF(CMAKE_CL_64)
-       SET(ZLIB_LIB zlib)
-  ELSE(CMAKE_CL_64)
-       SET(ZLIB_LIB libz)
-  ENDIF(CMAKE_CL_64)
+  SET(ZLIB_LIB libz)
   SET(ZLIB_LIBPATH ${ZLIB}/lib)
   
   SET(PTHREADS ${LIBDIR}/pthreads)
   SET(ZLIB_LIBPATH ${ZLIB}/lib)
   
   SET(PTHREADS ${LIBDIR}/pthreads)
@@ -436,10 +436,6 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 #-----------------------------------------------------------------------------
 # Common.
 
 #-----------------------------------------------------------------------------
 # Common.
 
-SET(FTGL ${CMAKE_SOURCE_DIR}/extern/bFTGL)
-SET(FTGL_INC ${FTGL}/include)
-SET(FTGL_LIB extern_ftgl)
-
 set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
 set(OPENJPEG_INC ${OPENJPEG})
 set(OPENJPEG_LIb extern_libopenjpeg)
 set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
 set(OPENJPEG_INC ${OPENJPEG})
 set(OPENJPEG_LIb extern_libopenjpeg)