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
This commit is contained in:
Daniel Genrich 2009-03-30 18:42:36 +00:00
parent 54ddfe1c48
commit e5bc44bcb2

@ -223,11 +223,15 @@ IF(WIN32)
SET(PYTHON_LIB python25)
SET(PYTHON_LIBPATH ${PYTHON}/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_LIBPATH ${ZLIB}/lib)
SET(PTHREADS ${LIBDIR}/pthreads)