[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19474] branches/blender2.5/blender/ CMakeLists.txt: Make cmake work out of the box for win64 systems ( disabling openal and fixing zlib)

[Daniel Genrich]

Revision: 19474
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19474
Author:   genscher
Date:     2009-03-30 20:42:36 +0200 (Mon, 30 Mar 2009)

Log Message:
-----------
Make cmake work out of the box for win64 systems (disabling openal and fixing zlib)

Command: cmake -G"Visual Studio 9 2008 Win64" ../blender-2.5-svn-folder

Modified Paths:
--------------
    branches/blender2.5/blender/CMakeLists.txt

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2009-03-30 18:26:58 UTC (rev 19473)
+++ branches/blender2.5/blender/CMakeLists.txt	2009-03-30 18:42:36 UTC (rev 19474)
@@ -223,11 +223,15 @@
   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 @@
 
   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)