Index: libmpc/branches/r2d/mppenc/CMakeLists.txt
===================================================================
--- libmpc/branches/r2d/mppenc/CMakeLists.txt	(revision 161)
+++ libmpc/branches/r2d/mppenc/CMakeLists.txt	(revision 162)
@@ -1,3 +1,27 @@
 add_definitions(-DMPP_ENCODER -DFAST_MATH -DCVD_FASTLOG)
-add_executable(mppenc analy_filter encode_sv7 huffsv7 profile stderr winmsg ans fastmath keyboard psy tags bitstream fft4g mppenc psy_tab tools cvd fft_routines pipeopen quant wave_in)
+
+include_directories(${libmpc_SOURCE_DIR}/include)
+include_directories(${libmpc_SOURCE_DIR}/libmpcpsy)
+include_directories(${libmpc_SOURCE_DIR}/libmpcenc)
+
+link_directories(${libmpc_BINARY_DIR}/libmpcpsy)
+link_directories(${libmpc_BINARY_DIR}/libmpcenc)
+
+add_executable(mppenc keyboard mppenc pipeopen stderr tags wave_in winmsg)
+
+target_link_libraries(mppenc mpcpsy_static)
+target_link_libraries(mppenc mpcenc_static)
+
+if(WIN32)
+target_link_libraries(mppenc winmm)
+endif(WIN32)
+
+if(NOT MSVC)
 target_link_libraries(mppenc m)
+endif(NOT MSVC)
+
+if(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
+target_link_libraries(mppenc ossaudio)
+endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
+
+install(TARGETS mppenc RUNTIME DESTINATION bin)
Index: libmpc/branches/r2d/mppenc/mppenc.c
===================================================================
--- libmpc/branches/r2d/mppenc/mppenc.c	(revision 161)
+++ libmpc/branches/r2d/mppenc/mppenc.c	(revision 162)
@@ -36,6 +36,6 @@
 int           APE_Version     = 2000;
 int           LowDelay        = 0;
-Bool_t        EnableTags      = FALSE;
-Bool_t        IsEndBeep       = FALSE;
+Bool_t        EnableTags      = MPC_FALSE;
+Bool_t        IsEndBeep       = MPC_FALSE;
 
 #define MODE_OVERWRITE          0
@@ -898,5 +898,5 @@
         }
         else if ( 0 == strcmp ( arg, "beep")  ) {
-            IsEndBeep = TRUE;
+            IsEndBeep = MPC_TRUE;
         }
         else if ( 0 == strcmp ( arg, "scale") ) {                                       // ScalingFactor
@@ -1043,5 +1043,5 @@
         }
         else if ( 0 == strcmp ( arg, "writetags") ) {
-            EnableTags = TRUE;
+            EnableTags = MPC_TRUE;
         }
         else if ( 0 == strcmp ( arg, "lowdelay") ) {
@@ -1633,12 +1633,12 @@
 	writeStreamInfo ( &e, m.Max_Band, m.MS_Channelmode > 0, SamplesInWAVE,
 					   m.SampleFreq, Wave.Channels > 2 ? 2 : Wave.Channels);
-	writeBlock(&e, "SI", TRUE);
+	writeBlock(&e, "SI", MPC_TRUE);
 	writeEncoderInfo(&e, m.MainQual, m.PNS > 0, MPPENC_MAJOR, MPPENC_MINOR,
 					  MPPENC_IMPLEMENT, MPPENC_BUILD);
-	writeBlock(&e, "EI", FALSE);
+	writeBlock(&e, "EI", MPC_FALSE);
 	e.seek_ptr = ftell(e.outputFile);
 	writeBits (&e, 0, 8);
 	writeBits (&e, 0, 32); // jump 40 bits for seek table pointer
-	writeBlock(&e, "SP", FALSE); // reserve space for seek pointer
+	writeBlock(&e, "SP", MPC_FALSE); // reserve space for seek pointer
 
 
@@ -1745,8 +1745,8 @@
 		e.seek_pos++;
 	}
-	writeBlock(&e, "AD", FALSE);
+	writeBlock(&e, "AD", MPC_FALSE);
 	writeSeekTable(&e);
-	writeBlock(&e, "ST", FALSE); // write seek table block
-	writeBlock(&e, "SE", FALSE); // write end of stream block
+	writeBlock(&e, "ST", MPC_FALSE); // write seek table block
+	writeBlock(&e, "SE", MPC_FALSE); // write end of stream block
     ShowProgress (&m, SamplesInWAVE, SamplesInWAVE, e.outputBits );