2007-03-25 Marek Safar <marek.safar@gmail.com>

	* monodiet.vcproj, monodis.vcproj, monograph.vcproj, pedump.vsproj:
	Fixed build.

svn path=/trunk/mono/; revision=74948

1 files changed, 34 insertions, 30 deletions

diff --git a/msvc/monodiet.vcproj b/msvc/monodiet.vcproj
index 67e9aa280b1..0c6cc530746 100644
--- a/msvc/monodiet.vcproj
+++ b/msvc/monodiet.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\;..\libgc\include;"..\VSDependancies\include\glib-2.0\glib";..\VSDependancies\include;..\mono\"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"

+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -70,9 +70,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib"

+				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib mono.lib Psapi.lib"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\;..\VSDependancies\lib"

+				AdditionalLibraryDirectories="..\;..\VSDependancies\lib;bin\mono\$(PlatformName)\$(ConfigurationName)"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				TargetMachine="1"

@@ -103,9 +103,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="1"

 			CharacterSet="2"

 			>

@@ -123,17 +123,26 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="2"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\;..\libgc\include;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;..\mono\"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				BufferSecurityCheck="true"

 				UsePrecompiledHeader="0"

+				ObjectFile="$(IntDir)/monodiet/"

+				ProgramDataBaseFileName="$(IntDir)/monodiet/vc80.pdb"

+				XMLDocumentationFileName="$(IntDir)/monodiet/"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

+				CompileAs="1"

+				DisableSpecificWarnings="4996"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -146,12 +155,12 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib"

 				LinkIncremental="1"

+				AdditionalLibraryDirectories="..\;..\VSDependancies\lib"

 				GenerateDebugInformation="true"

 				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -179,9 +188,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			Name="Release|Win32"

+			OutputDirectory="Release"

+			IntermediateDirectory="Release"

 			ConfigurationType="1"

 			CharacterSet="2"

 			>

@@ -199,26 +208,17 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\;..\libgc\include;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;..\mono\"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				Optimization="2"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				RuntimeLibrary="2"

 				BufferSecurityCheck="true"

 				UsePrecompiledHeader="0"

-				ObjectFile="$(IntDir)/monodiet/"

-				ProgramDataBaseFileName="$(IntDir)/monodiet/vc80.pdb"

-				XMLDocumentationFileName="$(IntDir)/monodiet/"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4996"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -231,12 +231,12 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\;..\VSDependancies\lib"

 				GenerateDebugInformation="true"

 				SubSystem="1"

-				TargetMachine="17"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -348,6 +348,10 @@
 			RelativePath="..\mono\metadata\monodiet.c"

 			>

 		</File>

+		<File

+			RelativePath="..\mono\metadata\opcodes.c"

+			>

+		</File>

 	</Files>

 	<Globals>

 	</Globals>