Index: /libmpc/trunk/CMakeLists.txt
===================================================================
--- /libmpc/trunk/CMakeLists.txt	(revision 449)
+++ /libmpc/trunk/CMakeLists.txt	(revision 450)
@@ -6,4 +6,6 @@
 set(CMAKE_VERBOSE_MAKEFILE false)
 TEST_BIG_ENDIAN(MPC_ENDIANNESS)
+
+option(SHARED "Use shared libmpcdec" OFF)
 
 add_definitions(-DFAST_MATH -DCVD_FASTLOG)
@@ -23,2 +25,4 @@
 add_subdirectory(mpccut)
 add_subdirectory(mpcchap)
+add_subdirectory(wavcmp)
+add_subdirectory(include)
Index: /libmpc/trunk/include/CMakeLists.txt
===================================================================
--- /libmpc/trunk/include/CMakeLists.txt	(revision 450)
+++ /libmpc/trunk/include/CMakeLists.txt	(revision 450)
@@ -0,0 +1,1 @@
+INSTALL(DIRECTORY mpc DESTINATION include)
Index: /libmpc/trunk/mpc2sv8/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpc2sv8/CMakeLists.txt	(revision 449)
+++ /libmpc/trunk/mpc2sv8/CMakeLists.txt	(revision 450)
@@ -13,5 +13,10 @@
 add_executable(mpc2sv8 mpc2sv8.c)
 
-target_link_libraries(mpc2sv8 mpcdec_static)
+if(SHARED)
+  target_link_libraries(mpc2sv8 mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpc2sv8 mpcdec_static)
+endif(SHARED)
+
 target_link_libraries(mpc2sv8 mpcenc_static)
 
@@ -28,2 +33,3 @@
 endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
 
+install(TARGETS mpc2sv8 RUNTIME DESTINATION bin)
Index: /libmpc/trunk/mpcchap/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpcchap/CMakeLists.txt	(revision 449)
+++ /libmpc/trunk/mpcchap/CMakeLists.txt	(revision 450)
@@ -15,5 +15,10 @@
 add_executable(mpcchap mpcchap dictionary iniparser ${libmpc_SOURCE_DIR}/common/tags)
 
-target_link_libraries(mpcchap mpcdec_static)
+if(SHARED)
+  target_link_libraries(mpcchap mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpcchap mpcdec_static)
+endif(SHARED)
+
 target_link_libraries(mpcchap mpcenc_static)
 target_link_libraries(mpcchap ${CUEFILE_LIBRARY})
@@ -23,2 +28,3 @@
 endif(NOT MSVC)
 
+install(TARGETS mpcchap RUNTIME DESTINATION bin)
Index: /libmpc/trunk/mpccut/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpccut/CMakeLists.txt	(revision 449)
+++ /libmpc/trunk/mpccut/CMakeLists.txt	(revision 450)
@@ -13,5 +13,10 @@
 add_executable(mpccut mpccut)
 
-target_link_libraries(mpccut mpcdec_static)
+if(SHARED)
+  target_link_libraries(mpccut mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpccut mpcdec_static)
+endif(SHARED)
+
 target_link_libraries(mpccut mpcenc_static)
 
@@ -20,2 +25,3 @@
 endif(NOT MSVC)
 
+install(TARGETS mpccut RUNTIME DESTINATION bin)
Index: /libmpc/trunk/mpcdec/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpcdec/CMakeLists.txt	(revision 449)
+++ /libmpc/trunk/mpcdec/CMakeLists.txt	(revision 450)
@@ -18,3 +18,10 @@
 
 target_link_libraries(mpcdec wavformat_static)
-target_link_libraries(mpcdec mpcdec_static)
+
+if(SHARED)
+  target_link_libraries(mpcdec mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpcdec mpcdec_static)
+endif(SHARED)
+
+install(TARGETS mpcdec RUNTIME DESTINATION bin)
Index: /libmpc/trunk/mpcgain/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpcgain/CMakeLists.txt	(revision 449)
+++ /libmpc/trunk/mpcgain/CMakeLists.txt	(revision 450)
@@ -19,5 +19,10 @@
 
 target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY})
-target_link_libraries(mpcgain mpcdec_static)
+
+if(SHARED)
+  target_link_libraries(mpcgain mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpcgain mpcdec_static)
+endif(SHARED)
 
 if(NOT MSVC)
@@ -25,2 +30,3 @@
 endif(NOT MSVC)
 
+install(TARGETS mpcgain RUNTIME DESTINATION bin)
Index: /libmpc/trunk/wavcmp/CMakeLists.txt
===================================================================
--- /libmpc/trunk/wavcmp/CMakeLists.txt	(revision 450)
+++ /libmpc/trunk/wavcmp/CMakeLists.txt	(revision 450)
@@ -0,0 +1,8 @@
+include_directories(${libmpc_SOURCE_DIR}/libwavformat)
+link_directories(${libmpc_BINARY_DIR}/libwavformat)
+
+add_executable(wavcmp wavcmp)
+
+target_link_libraries(wavcmp wavformat_static)
+
+install(TARGETS wavcmp RUNTIME DESTINATION bin)