Index: libmpc/branches/r2d/win32/mppenc.vcproj
===================================================================
--- libmpc/branches/r2d/win32/mppenc.vcproj	(revision 129)
+++ libmpc/branches/r2d/win32/mppenc.vcproj	(revision 174)
@@ -3,5 +3,5 @@
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="mppenc"
+	Name="mpcenc"
 	ProjectGUID="{15082E34-9324-469F-8423-F995B4814A37}"
 	RootNamespace="mppenc"
@@ -41,5 +41,6 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MPP_ENCODER"
+				AdditionalIncludeDirectories="../include;../libmpcenc;../libmpcpsy"
+				PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MPP_ENCODER;CVD_FASTLOG;FAST_MATH"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
@@ -123,5 +124,6 @@
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MPP_ENCODER"
+				AdditionalIncludeDirectories="../include;../libmpcenc;../libmpcpsy"
+				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MPP_ENCODER"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
@@ -189,85 +191,29 @@
 			>
 			<File
-				RelativePath="..\src\analy_filter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ans.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\bitstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\cvd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\encode_sv7.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fastmath.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fft4g.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fft_routines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\huffsv7.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\keyboard.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mppenc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\pipeopen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\profile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\psy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\psy_tab.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\quant.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\stderr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\tags.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\tools.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\wave_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\winmsg.c"
+				RelativePath="..\mpcenc\keyboard.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\mpcenc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\pipeopen.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\stderr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\tags.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\wave_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\winmsg.c"
 				>
 			</File>
@@ -279,37 +225,21 @@
 			>
 			<File
-				RelativePath="..\src\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\cvd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fastmath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\minimax.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mpp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mppdec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mppenc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\predict.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\profile.h"
+				RelativePath="..\mpcenc\config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\mpcenc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\mpp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\mppdec.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mpcenc\predict.h"
 				>
 			</File>
