Make cmake work out of the box for win64 systems (disabling openal and fixing zlib)
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 30 Mar 2009 18:42:36 +0000 (18:42 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 30 Mar 2009 18:42:36 +0000 (18:42 +0000)
Command: cmake -G"Visual Studio 9 2008 Win64" ../blender-2.5-svn-folder

CMakeLists.txt

index 45caf48091b08b9389aac97efafb792747b7e29c..2d11ea02aa4b9d51e1ae79342d3ede5704a4c404 100644 (file)
@@ -223,11 +223,15 @@ IF(WIN32)
   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)
@@ -238,11 +242,7 @@ IF(WIN32)
 
   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)