diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-03-30 22:42:36 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-03-30 22:42:36 +0400 |
| commit | e5bc44bcb20aadebd56106e90e962bcedb411d9d (patch) | |
| tree | c052f7b0da7ee2c9ee012103be6a595d9dd33e2d /CMakeLists.txt | |
| parent | 54ddfe1c4857ee4c6ad62c242b48a48fb0eff559 (diff) | |
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
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45caf48091b..2d11ea02aa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) |