Index: /libmpc/trunk/common/tags.c
===================================================================
--- /libmpc/trunk/common/tags.c	(revision 384)
+++ /libmpc/trunk/common/tags.c	(revision 385)
@@ -25,4 +25,8 @@
 #include <stdio.h>
 #include <mpc/mpc_types.h>
+
+#ifdef _WIN32
+# include <windows.h>
+#endif
 
 // Path separator
@@ -827,5 +831,5 @@
  * Writes collect tag items and write it to a file.
  * Items are destroyed, so tags can only be written once.
- * @param fp 
+ * @param fp
  * @param Version
  * @param flags options for writing header / footer :
@@ -833,5 +837,5 @@
  *              2 : do not write footer
  *              4 : do not write "APETAGEX"
- * @return 
+ * @return
  */
 int
@@ -846,5 +850,5 @@
     if ( TagCount == 0 )
         return 0;
-	
+
 	if (flags & TAG_NO_PREAMBLE) {
 		estimatedbytes -= 8;
Index: /libmpc/trunk/mpcchap/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpcchap/CMakeLists.txt	(revision 385)
+++ /libmpc/trunk/mpcchap/CMakeLists.txt	(revision 385)
@@ -0,0 +1,14 @@
+include_directories(${libmpc_SOURCE_DIR}/include)
+
+link_directories(${libmpc_BINARY_DIR}/libmpcdec)
+link_directories(${libmpc_BINARY_DIR}/libmpcenc)
+
+add_executable(mpcchap mpcchap dictionary iniparser ${libmpc_SOURCE_DIR}/common/tags)
+
+target_link_libraries(mpcchap mpcdec_static)
+target_link_libraries(mpcchap mpcenc_static)
+
+if(NOT MSVC)
+target_link_libraries(mpcchap m)
+endif(NOT MSVC)
+
Index: /libmpc/trunk/mpcenc/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpcenc/CMakeLists.txt	(revision 384)
+++ /libmpc/trunk/mpcenc/CMakeLists.txt	(revision 385)
@@ -10,5 +10,5 @@
 link_directories(${libmpc_BINARY_DIR}/libmpcenc)
 
-add_executable(mpcenc keyboard mpcenc pipeopen stderr tags wave_in winmsg)
+add_executable(mpcenc keyboard mpcenc pipeopen stderr ${libmpc_SOURCE_DIR}/common/tags wave_in winmsg)
 
 target_link_libraries(mpcenc mpcpsy_static)