diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | msvc/ChangeLog | 7 | ||||
| -rw-r--r-- | msvc/libmono.vcproj | 16 | ||||
| -rw-r--r-- | msvc/mono.def | 2 | ||||
| -rw-r--r-- | msvc/mono.sln | 14 | ||||
| -rw-r--r-- | msvc/mono.vcproj | 16 | ||||
| -rw-r--r-- | winconfig.h | 3 |
7 files changed, 41 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index fd9ca3c0e73..38b4ec9b325 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-31 Jonathan Chambers <joncham@gmail.com> + + * winconfig.h: Define HAVE_GETPROCESSID. + Contributed under MIT/X11 license. + 2007-12-28 Everaldo Canuto <ecanuto@novell.com> * configure.in: Add support for oprofile. diff --git a/msvc/ChangeLog b/msvc/ChangeLog index 06686aca691..f7d1622fdaf 100755 --- a/msvc/ChangeLog +++ b/msvc/ChangeLog @@ -1,3 +1,10 @@ +2007-12-31 Jonathan Chambers <joncham@gmail.com> + + * mono.sln, libmono.vcproj, mono.vcproj, mono.def: Update .def + file and fix some eglib target settings. + + Contributed under MIT/X11 license. + 2007-08-29 Jonathan Chambers <joncham@gmail.com> * mono.sln, libmono.vcproj, mono.vcproj, genmdesc.vcproj, monoburg.vcproj: diff --git a/msvc/libmono.vcproj b/msvc/libmono.vcproj index 82b13f8387c..1e7dee21da3 100644 --- a/msvc/libmono.vcproj +++ b/msvc/libmono.vcproj @@ -70,7 +70,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
OutputFile="$(OutDir)\mono.dll"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)\lib";".\lib\$(PlatformName)""
ModuleDefinitionFile="mono.def"
@@ -155,7 +155,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
OutputFile="$(OutDir)\mono.dll"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)\lib";".\lib\$(PlatformName)""
ModuleDefinitionFile="mono.def"
@@ -243,7 +243,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
OutputFile="$(OutDir)\mono.dll"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)\lib";".\lib\$(PlatformName)""
ModuleDefinitionFile="mono.def"
@@ -332,7 +332,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
OutputFile="$(OutDir)\mono.dll"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)\lib";".\lib\$(PlatformName)""
ModuleDefinitionFile="mono.def"
@@ -3730,6 +3730,14 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\mono\metadata\method-builder.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\method-builder.h"
+ >
+ </File>
+ <File
RelativePath="..\mono\metadata\monitor.c"
>
<FileConfiguration
diff --git a/msvc/mono.def b/msvc/mono.def index fb62bc4061d..7844774c5ed 100644 --- a/msvc/mono.def +++ b/msvc/mono.def @@ -407,6 +407,7 @@ mono_lookup_internal_call mono_lookup_pinvoke_call mono_main mono_marshal_string_to_utf16 +mono_mb_free mono_md5_final mono_md5_get_digest mono_md5_get_digest_from_file @@ -663,7 +664,6 @@ mono_thread_exit mono_thread_force_interruption_checkpoint mono_thread_get_abort_signal mono_thread_get_main -mono_thread_get_pending_exception mono_thread_has_appdomain_ref mono_thread_init mono_thread_interruption_checkpoint diff --git a/msvc/mono.sln b/msvc/mono.sln index 80cb55b5f9e..4e8f00a15db 100644 --- a/msvc/mono.sln +++ b/msvc/mono.sln @@ -2,15 +2,12 @@ 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
- {EB56000B-C80B-4E8B-908D-D84D31B517D3} = {EB56000B-C80B-4E8B-908D-D84D31B517D3}
- {5DCFA645-3358-4A20-9630-AEAAC5EED2D5} = {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}
{B7098DFA-31E6-4006-8A15-1C9A4E925149} = {B7098DFA-31E6-4006-8A15-1C9A4E925149}
+ {5DCFA645-3358-4A20-9630-AEAAC5EED2D5} = {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}
+ {EB56000B-C80B-4E8B-908D-D84D31B517D3} = {EB56000B-C80B-4E8B-908D-D84D31B517D3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-invoke", "test-invoke.vcproj", "{C5639B3F-288A-4A4B-A4A5-C0D85834221D}"
@@ -51,7 +48,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monodiet", "monodiet.vcproj EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monoburg", "monoburg.vcproj", "{5DCFA645-3358-4A20-9630-AEAAC5EED2D5}"
ProjectSection(ProjectDependencies) = postProject
- {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
{B7098DFA-31E6-4006-8A15-1C9A4E925149} = {B7098DFA-31E6-4006-8A15-1C9A4E925149}
EndProjectSection
EndProject
@@ -77,9 +73,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
@@ -486,4 +479,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/mono.vcproj b/msvc/mono.vcproj index 3c486c9b501..5ec3dcff0af 100644 --- a/msvc/mono.vcproj +++ b/msvc/mono.vcproj @@ -65,7 +65,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)/lib";"lib/$(PlatformName)""
GenerateDebugInformation="true"
@@ -146,7 +146,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)/lib";"lib/$(PlatformName)""
GenerateDebugInformation="true"
@@ -222,7 +222,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)/lib";"lib/$(PlatformName)""
GenerateDebugInformation="true"
@@ -301,7 +301,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)/lib";"lib/$(PlatformName)""
GenerateDebugInformation="true"
@@ -382,7 +382,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)/lib";"lib/$(PlatformName)""
GenerateDebugInformation="true"
@@ -463,7 +463,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)/lib";"lib/$(PlatformName)""
GenerateDebugInformation="true"
@@ -539,7 +539,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)/lib";"lib/$(PlatformName)""
GenerateDebugInformation="true"
@@ -618,7 +618,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib mono.lib Psapi.lib winmm.lib"
+ AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(MONO_DEPENDENCIES_PREFIX)/lib";"lib/$(PlatformName)""
GenerateDebugInformation="true"
diff --git a/winconfig.h b/winconfig.h index 6601a8c6637..072f3b86c43 100644 --- a/winconfig.h +++ b/winconfig.h @@ -45,6 +45,9 @@ /* String of disabled features */ #define DISABLED_FEATURES "none" +/* Have GetProcessId */ +#define HAVE_GETPROCESSID 1 + /* Disable AOT support */ /* #undef DISABLE_AOT */ |