From 6c5c58e05799f2b593cd81fcff57e6ef72ad57fb Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Sun, 9 Aug 2009 21:16:39 +0000
Subject: 2.5: Sound branch merge!

See mailing list for additional information.
---
 CMake/macros.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'CMake')

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
 
-- 
cgit v1.2.3