diff options
| author | Bill Holmes <holmes@mono-cvs.ximian.com> | 2009-10-13 22:56:06 +0400 |
|---|---|---|
| committer | Bill Holmes <holmes@mono-cvs.ximian.com> | 2009-10-13 22:56:06 +0400 |
| commit | 05689da893b6353d4009b78a304ed2b910d054a4 (patch) | |
| tree | ca7d3857b1eb2957974acdd376a2b782c30f574f /msvc05 | |
| parent | 3930d6b6268f3060c327e556f67fa60a2fd8de01 (diff) | |
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.
svn path=/trunk/mono/; revision=144038
Diffstat (limited to 'msvc05')
| -rwxr-xr-x | msvc05/ChangeLog | 7 | ||||
| -rw-r--r-- | msvc05/libmono.vcproj | 8 | ||||
| -rw-r--r-- | msvc05/libtest.vcproj | 16 | ||||
| -rw-r--r-- | msvc05/mono.def | 1 | ||||
| -rw-r--r-- | msvc05/monoposixhelper.def | 10 | ||||
| -rw-r--r-- | msvc05/monoposixhelper.vcproj | 18 |
6 files changed, 41 insertions, 19 deletions
diff --git a/msvc05/ChangeLog b/msvc05/ChangeLog index 44c8a339b8f..7b632513356 100755 --- 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 28901ecd14b..15dd1a1e71c 100644 --- a/msvc05/libmono.vcproj +++ b/msvc05/libmono.vcproj @@ -1516,6 +1516,14 @@ >
</File>
<File
+ RelativePath="..\mono\utils\mono-networkinterfaces.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\utils\mono-networkinterfaces.h"
+ >
+ </File>
+ <File
RelativePath="..\mono\utils\mono-path.c"
>
</File>
diff --git a/msvc05/libtest.vcproj b/msvc05/libtest.vcproj index a5d87ed8ded..ff72ec692c1 100644 --- a/msvc05/libtest.vcproj +++ b/msvc05/libtest.vcproj @@ -43,7 +43,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include""
+ AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";.."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -124,7 +124,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include""
+ AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";.."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -205,7 +205,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="1"
- AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include""
+ AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";.."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -287,7 +287,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="1"
- AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include""
+ AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";.."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -367,7 +367,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\eglib\src"
+ AdditionalIncludeDirectories="..\eglib\src;.."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\eglib\src"
+ AdditionalIncludeDirectories="..\eglib\src;.."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -529,7 +529,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="1"
- AdditionalIncludeDirectories="..\eglib\src"
+ AdditionalIncludeDirectories="..\eglib\src;.."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -611,7 +611,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="1"
- AdditionalIncludeDirectories="..\eglib\src"
+ AdditionalIncludeDirectories="..\eglib\src;.."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/msvc05/mono.def b/msvc05/mono.def index 5defa32481b..8c2733abe91 100644 --- 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 0ba42579e33..fd0f1b6c83a 100644 --- a/msvc05/monoposixhelper.def +++ b/msvc05/monoposixhelper.def @@ -92,12 +92,4 @@ Mono_Posix_ToSyslogLevel Mono_Posix_ToSyslogOptions
Mono_Posix_ToWaitOptions
Mono_Posix_ToXattrFlags
-create_z_stream
-free_z_stream
-z_stream_deflate
-z_stream_get_avail_in
-z_stream_inflate
-z_stream_set_avail_in
-z_stream_set_avail_out
-z_stream_set_next_in
-z_stream_set_next_out
+
diff --git a/msvc05/monoposixhelper.vcproj b/msvc05/monoposixhelper.vcproj index 9c0f6398757..060f313a54b 100644 --- a/msvc05/monoposixhelper.vcproj +++ b/msvc05/monoposixhelper.vcproj @@ -65,8 +65,10 @@ />
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib"
OutputFile="$(OutDir)\MonoPosixHelper.dll"
LinkIncremental="2"
+ AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
ModuleDefinitionFile="monoposixhelper.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -146,8 +148,10 @@ />
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib"
OutputFile="$(OutDir)\MonoPosixHelper.dll"
LinkIncremental="2"
+ AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
ModuleDefinitionFile="monoposixhelper.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -225,8 +229,10 @@ />
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib"
OutputFile="$(OutDir)\MonoPosixHelper.dll"
LinkIncremental="1"
+ AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
ModuleDefinitionFile="monoposixhelper.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -307,8 +313,10 @@ />
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib"
OutputFile="$(OutDir)\MonoPosixHelper.dll"
LinkIncremental="1"
+ AdditionalLibraryDirectories="$(MONO_DEPENDENCIES_PREFIX)\lib"
ModuleDefinitionFile="monoposixhelper.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -389,8 +397,10 @@ />
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="eglib.lib"
OutputFile="$(OutDir)\MonoPosixHelper.dll"
LinkIncremental="2"
+ AdditionalLibraryDirectories=""$(PlatformName)_$(ConfigurationName)/lib""
ModuleDefinitionFile="monoposixhelper.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -470,8 +480,10 @@ />
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="eglib.lib"
OutputFile="$(OutDir)\MonoPosixHelper.dll"
LinkIncremental="2"
+ AdditionalLibraryDirectories=""$(PlatformName)_$(ConfigurationName)/lib""
ModuleDefinitionFile="monoposixhelper.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -549,8 +561,10 @@ />
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="eglib.lib"
OutputFile="$(OutDir)\MonoPosixHelper.dll"
LinkIncremental="1"
+ AdditionalLibraryDirectories=""$(PlatformName)_$(ConfigurationName)/lib""
ModuleDefinitionFile="monoposixhelper.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -631,8 +645,10 @@ />
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="eglib.lib"
OutputFile="$(OutDir)\MonoPosixHelper.dll"
LinkIncremental="1"
+ AdditionalLibraryDirectories=""$(PlatformName)_$(ConfigurationName)/lib""
ModuleDefinitionFile="monoposixhelper.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -752,7 +768,7 @@ >
</File>
<File
- RelativePath="..\support\zlib_macros.c"
+ RelativePath="..\support\zlib-helper.c"
>
</File>
<File
|