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

diff --git a/msvc/ChangeLog b/msvc/ChangeLog
index 38fbf9ad84a0ce8d4659d040dd367c9ddd38bca0..d960406c9387dbb18a409eb56975783787cf7a6c 100755 (executable)
--- 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 748dae13380af3952e52234a70466adbdd81f6dc..dd1e93c616d9c724cce3f7f99ddaf338bbc93669 100644 (file)
--- a/msvc/genmdesc.vcproj
+++ b/msvc/genmdesc.vcproj
@@ -401,7 +401,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"\r
+                               AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -425,7 +425,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="eglib.lib"\r
+                               AdditionalDependencies="eglib.lib ws2_32.lib "\r
                                OutputFile="$(OutDir)/genmdesc.exe"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\lib\$(PlatformName)"\r
@@ -490,8 +490,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src"\r
-                               PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"\r
+                               PreprocessorDefinitions="__x86_64__;WIN64;_WIN64;_DEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -514,7 +514,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib"\r
+                               AdditionalDependencies="eglib.lib ws2_32.lib "\r
                                OutputFile="$(OutDir)/genmdesc.exe"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\lib\$(PlatformName)"\r
@@ -545,7 +545,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"\r
+                               CommandLine="runmdesc.bat &quot;$(TargetPath)&quot; $(PlatformName)"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -579,7 +579,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src"\r
+                               AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
@@ -602,7 +602,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib"\r
+                               AdditionalDependencies="eglib.lib ws2_32.lib "\r
                                OutputFile="$(OutDir)/genmdesc.exe"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\lib\$(PlatformName)"\r
@@ -668,8 +668,8 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src"\r
-                               PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"\r
+                               PreprocessorDefinitions="__x86_64__;WIN64;_WIN64;NDEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
@@ -691,7 +691,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib"\r
+                               AdditionalDependencies="eglib.lib ws2_32.lib "\r
                                OutputFile="$(OutDir)/genmdesc.exe"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\lib\$(PlatformName)"\r

diff --git a/msvc/libmono.vcproj b/msvc/libmono.vcproj
index 1dc468776801f1cfb79d03cbd433ff00f4d969e9..002dc0f54d449949636461c263a0082ad752dc4f 100644 (file)
--- a/msvc/libmono.vcproj
+++ b/msvc/libmono.vcproj
@@ -515,6 +515,7 @@
                                AdditionalLibraryDirectories="".\lib\$(PlatformName)""\r
                                ModuleDefinitionFile="mono.def"\r
                                GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(TargetDir)libmono.pdb"\r
                                ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"\r
                                TargetMachine="17"\r
                        />\r
@@ -733,6 +734,14 @@
                <Filter\r
                        Name="utils"\r
                        >\r
+                       <File\r
+                               RelativePath="..\mono\utils\dlmalloc.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\mono\utils\dlmalloc.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\mono\utils\mono-codeman.c"\r
                                >\r

diff --git a/msvc/mono.sln b/msvc/mono.sln
index 7a63fc1fcb07101af62cd536165537b2f6b21be0..1a0501cdb69d716a35e6b5e744d7b77240cd9cf6 100644 (file)
--- a/msvc/mono.sln
+++ b/msvc/mono.sln
@@ -2,6 +2,9 @@
 Microsoft Visual Studio Solution File, Format Version 9.00\r
 # Visual Studio 2005\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmdesc", "genmdesc.vcproj", "{B7098DFA-31E6-4006-8A15-1C9A4E925149}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmono", "libmono.vcproj", "{CB0D9E92-293C-439C-9AC7-C5F59B6E0771}"\r
        ProjectSection(ProjectDependencies) = postProject\r
@@ -73,9 +76,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{ECA11C76-E192-4F67-A8FA-28B637D9716F}"\r
 EndProject\r
 Global\r
-       GlobalSection(DPCodeReviewSolutionGUID) = preSolution\r
-               DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}\r
-       EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug_eglib|Any CPU = Debug_eglib|Any CPU\r
                Debug_eglib|Mixed Platforms = Debug_eglib|Mixed Platforms\r
@@ -482,4 +482,7 @@ Global
                {C2EB666E-9146-4B7A-85F6-25F9EA313770} = {5FE09AA5-C3C9-45EA-A323-36A11B653CEC}\r
                {80A0620A-3478-4E1A-AA7C-0D2387B892AB} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}\r
        EndGlobalSection\r
+       GlobalSection(DPCodeReviewSolutionGUID) = preSolution\r
+               DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}\r
+       EndGlobalSection\r
 EndGlobal\r

diff --git a/msvc/monoburg.vcproj b/msvc/monoburg.vcproj
index bd6b70721e03303018fe7b7815319c5485f35727..80817ed2bfb998a13e06c0ea4ac3f73dcf08defb 100644 (file)
--- a/msvc/monoburg.vcproj
+++ b/msvc/monoburg.vcproj
@@ -461,7 +461,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="__x86_64__;WIN64;_WIN64;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -627,7 +627,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\eglib\src;..\..\mono\eglib\src"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="__x86_64__;WIN64;_WIN64;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"\r
                                RuntimeLibrary="2"\r
                                BufferSecurityCheck="true"\r
                                UsePrecompiledHeader="0"\r