Index: /libmpc/branches/r2d/CMakeLists.txt
===================================================================
--- /libmpc/branches/r2d/CMakeLists.txt	(revision 237)
+++ /libmpc/branches/r2d/CMakeLists.txt	(revision 238)
@@ -11,11 +11,9 @@
 endif(NOT MSVC)
 
-add_subdirectory(common)
 add_subdirectory(libmpcdec)
 add_subdirectory(libmpcpsy)
 add_subdirectory(libmpcenc)
-add_subdirectory(libreplaygain)
 add_subdirectory(libwavformat)
-add_subdirectory(mpcgain)
+# add_subdirectory(mpcgain)
 add_subdirectory(mpcdec)
 add_subdirectory(mpcenc)
Index: /libmpc/branches/r2d/libmpcdec/CMakeLists.txt
===================================================================
--- /libmpc/branches/r2d/libmpcdec/CMakeLists.txt	(revision 237)
+++ /libmpc/branches/r2d/libmpcdec/CMakeLists.txt	(revision 238)
@@ -1,5 +1,2 @@
 include_directories(${libmpc_SOURCE_DIR}/include)
-include_directories(${libmpc_SOURCE_DIR}/common)
-link_directories(${libmpc_BINARY_DIR}/common)
-add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter)
-target_link_libraries(mpcdec_static common_static)
+add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
Index: /libmpc/branches/r2d/libmpcenc/CMakeLists.txt
===================================================================
--- /libmpc/branches/r2d/libmpcenc/CMakeLists.txt	(revision 237)
+++ /libmpc/branches/r2d/libmpcenc/CMakeLists.txt	(revision 238)
@@ -1,5 +1,2 @@
 include_directories(${libmpc_SOURCE_DIR}/include)
-include_directories(${libmpc_SOURCE_DIR}/common)
-link_directories(${libmpc_BINARY_DIR}/common)
-add_library(mpcenc_static STATIC analy_filter bitstream encode_sv7 huffsv7 quant)
-target_link_libraries(mpcenc_static common_static)
+add_library(mpcenc_static STATIC analy_filter bitstream encode_sv7 huffsv7 quant ${libmpc_SOURCE_DIR}/common/crc32)
Index: /libmpc/branches/r2d/libmpcpsy/CMakeLists.txt
===================================================================
--- /libmpc/branches/r2d/libmpcpsy/CMakeLists.txt	(revision 237)
+++ /libmpc/branches/r2d/libmpcpsy/CMakeLists.txt	(revision 238)
@@ -1,5 +1,2 @@
 include_directories(${libmpc_SOURCE_DIR}/include)
-include_directories(${libmpc_SOURCE_DIR}/common)
-link_directories(${libmpc_BINARY_DIR}/common)
-add_library(mpcpsy_static STATIC ans cvd fft4g fft_routines profile psy psy_tab) 
-target_link_libraries(mpcpsy_static common_static)
+add_library(mpcpsy_static STATIC ans cvd fft4g fft_routines profile psy psy_tab)