Index: /libmpc/trunk/CMakeLists.txt
===================================================================
--- /libmpc/trunk/CMakeLists.txt	(revision 319)
+++ /libmpc/trunk/CMakeLists.txt	(revision 320)
@@ -19,2 +19,3 @@
 add_subdirectory(mpcenc)
 add_subdirectory(mpc2sv8)
+add_subdirectory(mpccut)
Index: /libmpc/trunk/mpccut/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpccut/CMakeLists.txt	(revision 320)
+++ /libmpc/trunk/mpccut/CMakeLists.txt	(revision 320)
@@ -0,0 +1,21 @@
+include_directories(${libmpc_SOURCE_DIR}/include)
+
+include_directories(${libmpc_SOURCE_DIR}/libmpcdec)
+link_directories(${libmpc_BINARY_DIR}/libmpcdec)
+include_directories(${libmpc_SOURCE_DIR}/libmpcenc)
+link_directories(${libmpc_BINARY_DIR}/libmpcenc)
+
+if(MSVC)
+include_directories(${libmpc_SOURCE_DIR}/win32)
+add_executable(mpccut mpccut ${libmpc_SOURCE_DIR}/win32/attgetopt)
+endif(MSVC)
+
+add_executable(mpccut mpccut)
+
+target_link_libraries(mpccut mpcdec_static)
+target_link_libraries(mpccut mpcenc_static)
+
+if(NOT MSVC)
+target_link_libraries(mpccut m)
+endif(NOT MSVC)
+
Index: /libmpc/trunk/mpccut/mpccut.c
===================================================================
--- /libmpc/trunk/mpccut/mpccut.c	(revision 319)
+++ /libmpc/trunk/mpccut/mpccut.c	(revision 320)
@@ -41,4 +41,8 @@
 #include "../libmpcdec/huffman.h"
 #include "../libmpcdec/mpc_bits_reader.h"
+
+#ifdef _MSC_VER
+#define atoll _atoi64
+#endif
 
 static void copy_data(FILE * in_file, int in_file_pos, FILE * out_file, int data_size)
Index: /libmpc/trunk/mpcdec/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpcdec/CMakeLists.txt	(revision 319)
+++ /libmpc/trunk/mpcdec/CMakeLists.txt	(revision 320)
@@ -6,5 +6,10 @@
 link_directories(${libmpc_BINARY_DIR}/libmpcdec)
 
-add_executable(mpcdec mpcdec.c)
+if(MSVC)
+include_directories(${libmpc_SOURCE_DIR}/win32)
+add_executable(mpcdec mpcdec ${libmpc_SOURCE_DIR}/win32/attgetopt)
+endif(MSVC)
+
+add_executable(mpcdec mpcdec)
 
 if(NOT MSVC)
Index: /libmpc/trunk/mpcgain/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpcgain/CMakeLists.txt	(revision 319)
+++ /libmpc/trunk/mpcgain/CMakeLists.txt	(revision 320)
@@ -5,5 +5,5 @@
 )
 
-FIND_LIBRARY(REPLAY_GAIN_LIBRARY NAMES replaygain PATHS
+FIND_LIBRARY(REPLAY_GAIN_LIBRARY NAMES replaygain replaygain_static PATHS
 	/usr/lib
 	/usr/local/lib