diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 01:16:39 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 01:16:39 +0400 |
| commit | 6c5c58e05799f2b593cd81fcff57e6ef72ad57fb (patch) | |
| tree | 8add929ef94d03fc69aecce6ef2baf283505782f /CMake/macros.cmake | |
| parent | c1ca2ab5dceb8d5355215a3c7a80b171f394e487 (diff) | |
2.5: Sound branch merge!
See mailing list for additional information.
Diffstat (limited to 'CMake/macros.cmake')
| -rw-r--r-- | CMake/macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 8744fc2cdf9..3f706e5ed95 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -43,7 +43,7 @@ MACRO(SETUP_LIBDIRS) CMAKE_POLICY(SET CMP0003 NEW) endif(COMMAND cmake_policy) LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH}) - LINK_DIRECTORIES(${FREETYPE_LIBPATH}) + LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH}) IF(WITH_INTERNATIONAL) LINK_DIRECTORIES(${GETTEXT_LIBPATH}) ENDIF(WITH_INTERNATIONAL) @@ -82,7 +82,7 @@ MACRO(SETUP_LIBLINKS TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) - TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB}) + TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB} ${LIBSAMPLERATE_LIB}) # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions |