projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3930d6b)
2009-10-13 Bill Holmes <billholmes54@gmail.com>
authorBill Holmes <holmes@mono-cvs.ximian.com>
Tue, 13 Oct 2009 18:56:06 +0000 (18:56 -0000)
committerBill Holmes <holmes@mono-cvs.ximian.com>
Tue, 13 Oct 2009 18:56:06 +0000 (18:56 -0000)
* mono.def, monoposixhelper.def, libmono.vcproj, libtest.vcproj,
  monoposixhelper.vcproj : Fixing MSVC build.

Code is contributed under MIT/X11 license.

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

msvc05/ChangeLog patch | blob | history
msvc05/libmono.vcproj patch | blob | history
msvc05/libtest.vcproj patch | blob | history
msvc05/mono.def patch | blob | history
msvc05/monoposixhelper.def patch | blob | history
msvc05/monoposixhelper.vcproj patch | blob | history

diff --git a/msvc05/ChangeLog b/msvc05/ChangeLog
index 44c8a339b8fc89ddbda0a0a4d2cfbc008dc830c4..7b632513356b6f3e11782ff0881f3f2538e13d8e 100755 (executable)
--- a/msvc05/ChangeLog
+++ b/msvc05/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-13  Bill Holmes  <billholmes54@gmail.com>
+
+       * mono.def, monoposixhelper.def, libmono.vcproj, libtest.vcproj,
+         monoposixhelper.vcproj : Fixing MSVC build.
+
+       Code is contributed under MIT/X11 license.
+
 2009-05-04  Bill Holmes  <billholmes54@gmail.com>
 
        * eglib.vcproj, genmdesc.vcproj, libgc.vcproj, libmono.vcproj,
diff --git a/msvc05/libmono.vcproj b/msvc05/libmono.vcproj
index 28901ecd14bac8ca257ddfad48577cc9182501ab..15dd1a1e71cfc8143d11e7e8e4c48392b0ff32ee 100644 (file)
--- a/msvc05/libmono.vcproj
+++ b/msvc05/libmono.vcproj
@@ -1515,6 +1515,14 @@
                                RelativePath="..\mono\utils\mono-mmap.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mono\utils\mono-networkinterfaces.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\mono\utils\mono-networkinterfaces.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\mono\utils\mono-path.c"\r
                                >\r
diff --git a/msvc05/libtest.vcproj b/msvc05/libtest.vcproj
index a5d87ed8ded75ca1f717a28f25b54a6bfefdafb9..ff72ec692c1aa63d2d1f1f556fa16a5a15dd89a0 100644 (file)
--- a/msvc05/libtest.vcproj
+++ b/msvc05/libtest.vcproj
@@ -43,7 +43,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;.."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -124,7 +124,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;.."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -205,7 +205,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -287,7 +287,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -367,7 +367,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\eglib\src"\r
+                               AdditionalIncludeDirectories="..\eglib\src;.."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -448,7 +448,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\eglib\src"\r
+                               AdditionalIncludeDirectories="..\eglib\src;.."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -529,7 +529,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="..\eglib\src"\r
+                               AdditionalIncludeDirectories="..\eglib\src;.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -611,7 +611,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="..\eglib\src"\r
+                               AdditionalIncludeDirectories="..\eglib\src;.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
diff --git a/msvc05/mono.def b/msvc05/mono.def
index 5defa32481b54d04f0172dcc20bdd152eb2c57d3..8c2733abe919c3a7990681f468ef1c665832e67c 100644 (file)
--- a/msvc05/mono.def
+++ b/msvc05/mono.def
@@ -261,7 +261,6 @@ mono_gc_max_generation
 mono_gc_out_of_memory
 mono_gc_wbarrier_arrayref_copy
 mono_gc_wbarrier_generic_store
-mono_gc_wbarrier_object
 mono_gc_wbarrier_set_arrayref
 mono_gc_wbarrier_set_field
 mono_gc_wbarrier_value_copy
diff --git a/msvc05/monoposixhelper.def b/msvc05/monoposixhelper.def
index 0ba42579e337ee05c171bc7c14d87794b26f4f0c..fd0f1b6c83aecc4fde96bf285ad5e8c664e0410f 100644 (file)
--- a/msvc05/monoposixhelper.def
+++ b/msvc05/monoposixhelper.def
@@ -92,12 +92,4 @@ Mono_Posix_ToSyslogLevel
 Mono_Posix_ToSyslogOptions\r
 Mono_Posix_ToWaitOptions\r
 Mono_Posix_ToXattrFlags\r
-create_z_stream\r
-free_z_stream\r
-z_stream_deflate\r
-z_stream_get_avail_in\r
-z_stream_inflate\r
-z_stream_set_avail_in\r
-z_stream_set_avail_out\r
-z_stream_set_next_in\r
-z_stream_set_next_out\r
+\r
diff --git a/msvc05/monoposixhelper.vcproj b/msvc05/monoposixhelper.vcproj
index 9c0f6398757c26933cddfbb20d5a6660e639a2c9..060f313a54b779113245764d503933afe9d2ecf6 100644 (file)
--- a/msvc05/monoposixhelper.vcproj
+++ b/msvc05/monoposixhelper.vcproj
@@ -65,8 +65,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib"\r
                                OutputFile="$(OutDir)\MonoPosixHelper.dll"\r
                                LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"\r
                                ModuleDefinitionFile="monoposixhelper.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -146,8 +148,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib"\r
                                OutputFile="$(OutDir)\MonoPosixHelper.dll"\r
                                LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"\r
                                ModuleDefinitionFile="monoposixhelper.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -225,8 +229,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib"\r
                                OutputFile="$(OutDir)\MonoPosixHelper.dll"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"\r
                                ModuleDefinitionFile="monoposixhelper.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -307,8 +313,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib"\r
                                OutputFile="$(OutDir)\MonoPosixHelper.dll"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"\r
                                ModuleDefinitionFile="monoposixhelper.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -389,8 +397,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="eglib.lib"\r
                                OutputFile="$(OutDir)\MonoPosixHelper.dll"\r
                                LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
                                ModuleDefinitionFile="monoposixhelper.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -470,8 +480,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="eglib.lib"\r
                                OutputFile="$(OutDir)\MonoPosixHelper.dll"\r
                                LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
                                ModuleDefinitionFile="monoposixhelper.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -549,8 +561,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="eglib.lib"\r
                                OutputFile="$(OutDir)\MonoPosixHelper.dll"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
                                ModuleDefinitionFile="monoposixhelper.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -631,8 +645,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="eglib.lib"\r
                                OutputFile="$(OutDir)\MonoPosixHelper.dll"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
                                ModuleDefinitionFile="monoposixhelper.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -752,7 +768,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\support\zlib_macros.c"\r
+                               RelativePath="..\support\zlib-helper.c"\r
                                >\r
                        </File>\r
                        <File\r
my mono mirror. check out Moved to http://github.com/mono/mono