diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-08-30 20:18:05 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-08-30 20:18:05 +0400 |
| commit | 557cf2906befb77eae15a96a385b0d92d563c31e (patch) | |
| tree | 20dec87645e0ea3f511ff08b007b93ec2a4900c6 /CMakeLists.txt | |
| parent | 257ad93e6deb3e69198bd7c52fa9b44e4093746e (diff) | |
2.5 Sound:
* Updated UserDef RNA so that only compiled in audio drivers are displayed. (Missing definitions in Makefiles, someone fix please!)
* Fixed libsndfile and ffmpeg building with CMake with msvc.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a92099698c6..1921ef65017 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -259,7 +259,7 @@ IF(WIN32) IF(WITH_SNDFILE) SET(SNDFILE ${LIBDIR}/sndfile) SET(SNDFILE_INC ${SNDFILE}/include) - SET(SNDFILE_LIB sndfile-1) + SET(SNDFILE_LIB libsndfile-1) SET(SNDFILE_LIBPATH ${SNDFILE}/lib) ENDIF(WITH_SNDFILE) @@ -329,7 +329,7 @@ IF(WIN32) SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries) SET(FFMPEG ${LIBDIR}/ffmpeg) - SET(FFMPEG_INC ${FFMPEG}/include) + SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc) SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) |