Index: /libmpc/branches/r2d/CMakeLists.txt
===================================================================
--- /libmpc/branches/r2d/CMakeLists.txt	(revision 239)
+++ /libmpc/branches/r2d/CMakeLists.txt	(revision 240)
@@ -8,5 +8,5 @@
 
 if(NOT MSVC)
-set(CMAKE_C_FLAGS "-O2 -fomit-frame-pointer -pipe")
+set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe")
 endif(NOT MSVC)
 
@@ -15,5 +15,5 @@
 add_subdirectory(libmpcenc)
 add_subdirectory(libwavformat)
-# add_subdirectory(mpcgain)
+add_subdirectory(mpcgain)
 add_subdirectory(mpcdec)
 add_subdirectory(mpcenc)
Index: /libmpc/branches/r2d/mpcgain/CMakeLists.txt
===================================================================
--- /libmpc/branches/r2d/mpcgain/CMakeLists.txt	(revision 239)
+++ /libmpc/branches/r2d/mpcgain/CMakeLists.txt	(revision 240)
@@ -1,13 +1,22 @@
+FIND_PATH(REPLAY_GAIN_INCLUDE_DIR replaygain/gain_analysis.h
+	/usr/include
+	/usr/local/include
+	${libmpc_SOURCE_DIR}/../libreplaygain/include
+)
+
+FIND_LIBRARY(REPLAY_GAIN_LIBRARY NAMES replaygain replaygain_static PATHS
+	/usr/lib
+	/usr/local/lib
+	${libmpc_SOURCE_DIR}/../libreplaygain/bin/src/release
+)
+
 include_directories(${libmpc_SOURCE_DIR}/include)
+include_directories(${REPLAY_GAIN_INCLUDE_DIR})
 
-include_directories(${libmpc_SOURCE_DIR}/libreplaygain)
-link_directories(${libmpc_BINARY_DIR}/libreplaygain)
-
-include_directories(${libmpc_SOURCE_DIR}/libmpcdec)
 link_directories(${libmpc_BINARY_DIR}/libmpcdec)
 
 add_executable(mpcgain mpcgain.c)
 
-target_link_libraries(mpcgain replaygain_static)
+target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY})
 target_link_libraries(mpcgain mpcdec_static)