2008-04-15 Jonathan Chambers <joncham@gmail.com>

	* mono.sln, libmono.vcproj, monoburg.vcproj, genmdesc.vcproj: Flush Win64
	  and eglib changes.

	Contributed under MIT/X11 license.


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

5 files changed, 34 insertions, 16 deletions

diff --git a/msvc/ChangeLog b/msvc/ChangeLog
index 38fbf9ad84a..d960406c938 100755
--- a/msvc/ChangeLog
+++ b/msvc/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-15  Jonathan Chambers  <joncham@gmail.com>
+	* mono.sln, libmono.vcproj, monoburg.vcproj, genmdesc.vcproj: Flush Win64
+	  and eglib changes.
+
+	Contributed under MIT/X11 license.
+
 2008-04-04  Bill Holmes  <billholmes54@gmail.com>
 
 	* runburg.bat, runmdesc.bat:  Reverting back to r97888.  The PATH was correct before.
diff --git a/msvc/genmdesc.vcproj b/msvc/genmdesc.vcproj
index 748dae13380..dd1e93c616d 100644
--- a/msvc/genmdesc.vcproj
+++ b/msvc/genmdesc.vcproj
@@ -401,7 +401,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"

+				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"

 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -425,7 +425,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="eglib.lib"

+				AdditionalDependencies="eglib.lib ws2_32.lib "

 				OutputFile="$(OutDir)/genmdesc.exe"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories=".\lib\$(PlatformName)"

@@ -490,8 +490,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"

+				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"

+				PreprocessorDefinitions="__x86_64__;WIN64;_WIN64;_DEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -514,7 +514,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib"

+				AdditionalDependencies="eglib.lib ws2_32.lib "

 				OutputFile="$(OutDir)/genmdesc.exe"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories=".\lib\$(PlatformName)"

@@ -545,7 +545,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"

+				CommandLine="runmdesc.bat &quot;$(TargetPath)&quot; $(PlatformName)"

 			/>

 		</Configuration>

 		<Configuration

@@ -579,7 +579,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src"

+				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"

 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -602,7 +602,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib"

+				AdditionalDependencies="eglib.lib ws2_32.lib "

 				OutputFile="$(OutDir)/genmdesc.exe"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories=".\lib\$(PlatformName)"

@@ -668,8 +668,8 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"

+				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"

+				PreprocessorDefinitions="__x86_64__;WIN64;_WIN64;NDEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

@@ -691,7 +691,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib"

+				AdditionalDependencies="eglib.lib ws2_32.lib "

 				OutputFile="$(OutDir)/genmdesc.exe"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories=".\lib\$(PlatformName)"

diff --git a/msvc/libmono.vcproj b/msvc/libmono.vcproj
index 1dc46877680..002dc0f54d4 100644
--- a/msvc/libmono.vcproj
+++ b/msvc/libmono.vcproj
@@ -515,6 +515,7 @@
 				AdditionalLibraryDirectories="&quot;.\lib\$(PlatformName)&quot;"

 				ModuleDefinitionFile="mono.def"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(TargetDir)libmono.pdb"

 				ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"

 				TargetMachine="17"

 			/>

@@ -734,6 +735,14 @@
 			Name="utils"

 			>

 			<File

+				RelativePath="..\mono\utils\dlmalloc.c"

+				>

+			</File>

+			<File

+				RelativePath="..\mono\utils\dlmalloc.h"

+				>

+			</File>

+			<File

 				RelativePath="..\mono\utils\mono-codeman.c"

 				>

 				<FileConfiguration

diff --git a/msvc/mono.sln b/msvc/mono.sln
index 7a63fc1fcb0..1a0501cdb69 100644
--- a/msvc/mono.sln
+++ b/msvc/mono.sln
@@ -2,6 +2,9 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

 # Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmdesc", "genmdesc.vcproj", "{B7098DFA-31E6-4006-8A15-1C9A4E925149}"

+	ProjectSection(ProjectDependencies) = postProject

+		{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmono", "libmono.vcproj", "{CB0D9E92-293C-439C-9AC7-C5F59B6E0771}"

 	ProjectSection(ProjectDependencies) = postProject

@@ -73,9 +76,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{ECA11C76-E192-4F67-A8FA-28B637D9716F}"

 EndProject

 Global

-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution

-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

-	EndGlobalSection

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug_eglib|Any CPU = Debug_eglib|Any CPU

 		Debug_eglib|Mixed Platforms = Debug_eglib|Mixed Platforms

@@ -482,4 +482,7 @@ Global
 		{C2EB666E-9146-4B7A-85F6-25F9EA313770} = {5FE09AA5-C3C9-45EA-A323-36A11B653CEC}

 		{80A0620A-3478-4E1A-AA7C-0D2387B892AB} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}

 	EndGlobalSection

+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution

+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

+	EndGlobalSection

 EndGlobal

diff --git a/msvc/monoburg.vcproj b/msvc/monoburg.vcproj
index bd6b70721e0..80817ed2bfb 100644
--- a/msvc/monoburg.vcproj
+++ b/msvc/monoburg.vcproj
@@ -461,7 +461,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="__x86_64__;WIN64;_WIN64;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -627,7 +627,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="__x86_64__;WIN64;_WIN64;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

 				RuntimeLibrary="2"

 				BufferSecurityCheck="true"

 				UsePrecompiledHeader="0"