Author: marek
Date: 2007-03-24 20:10:12 -0500 (Sat, 24 Mar 2007)
New Revision: 74948
Modified:
trunk/mono/msvc/ChangeLog
trunk/mono/msvc/monodiet.vcproj
trunk/mono/msvc/monodis.vcproj
trunk/mono/msvc/monograph.vcproj
trunk/mono/msvc/pedump.vcproj
Log:
2007-03-25 Marek Safar <[EMAIL PROTECTED]>
* monodiet.vcproj, monodis.vcproj, monograph.vcproj, pedump.vsproj:
Fixed build.
Modified: trunk/mono/msvc/ChangeLog
===================================================================
--- trunk/mono/msvc/ChangeLog 2007-03-24 20:56:11 UTC (rev 74947)
+++ trunk/mono/msvc/ChangeLog 2007-03-25 01:10:12 UTC (rev 74948)
@@ -1,3 +1,8 @@
+2007-03-25 Marek Safar <[EMAIL PROTECTED]>
+
+ * monodiet.vcproj, monodis.vcproj, monograph.vcproj, pedump.vsproj:
+ Fixed build.
+
2007-03-19 Jonathan Chambers <[EMAIL PROTECTED]>
* libmono.vcproj, genmdesc.vcproj: Reset browse information
Modified: trunk/mono/msvc/monodiet.vcproj
===================================================================
--- trunk/mono/msvc/monodiet.vcproj 2007-03-24 20:56:11 UTC (rev 74947)
+++ trunk/mono/msvc/monodiet.vcproj 2007-03-25 01:10:12 UTC (rev 74948)
@@ -44,7 +44,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\;..\libgc\include;"..\VSDependancies\include\glib-2.0\glib";..\VSDependancies\include;..\mono\"
-
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"
+
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -70,9 +70,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib
gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib
Psapi.lib"
+ AdditionalDependencies="glib-2.0.lib
gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib mono.lib Psapi.lib"
LinkIncremental="1"
-
AdditionalLibraryDirectories="..\;..\VSDependancies\lib"
+
AdditionalLibraryDirectories="..\;..\VSDependancies\lib;bin\mono\$(PlatformName)\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -103,9 +103,9 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -123,17 +123,26 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
+ Optimization="0"
+
AdditionalIncludeDirectories="..\;..\libgc\include;"..\VSDependancies\include\glib-2.0\glib";..\VSDependancies\include;..\mono\"
+
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
BufferSecurityCheck="true"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)/monodiet/"
+
ProgramDataBaseFileName="$(IntDir)/monodiet/vc80.pdb"
+ XMLDocumentationFileName="$(IntDir)/monodiet/"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
+ CompileAs="1"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -146,12 +155,12 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib
gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib
Psapi.lib"
LinkIncremental="1"
+
AdditionalLibraryDirectories="..\;..\VSDependancies\lib"
GenerateDebugInformation="true"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -179,9 +188,9 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2"
>
@@ -199,26 +208,17 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories="..\;..\libgc\include;"..\VSDependancies\include\glib-2.0\glib";..\VSDependancies\include;..\mono\"
-
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ Optimization="2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
BufferSecurityCheck="true"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)/monodiet/"
-
ProgramDataBaseFileName="$(IntDir)/monodiet/vc80.pdb"
- XMLDocumentationFileName="$(IntDir)/monodiet/"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -231,12 +231,12 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib
gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib
Psapi.lib"
LinkIncremental="1"
-
AdditionalLibraryDirectories="..\;..\VSDependancies\lib"
GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="17"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -348,6 +348,10 @@
RelativePath="..\mono\metadata\monodiet.c"
>
</File>
+ <File
+ RelativePath="..\mono\metadata\opcodes.c"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: trunk/mono/msvc/monodis.vcproj
===================================================================
--- trunk/mono/msvc/monodis.vcproj 2007-03-24 20:56:11 UTC (rev 74947)
+++ trunk/mono/msvc/monodis.vcproj 2007-03-25 01:10:12 UTC (rev 74948)
@@ -67,9 +67,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib
gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib
Psapi.lib"
+ AdditionalDependencies="glib-2.0.lib
gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib mono.lib Psapi.lib"
LinkIncremental="1"
-
AdditionalLibraryDirectories="..\VSDependancies\lib"
+
AdditionalLibraryDirectories="..\VSDependancies\lib;bin/mono/$(PlatformName)/$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
Modified: trunk/mono/msvc/monograph.vcproj
===================================================================
--- trunk/mono/msvc/monograph.vcproj 2007-03-24 20:56:11 UTC (rev 74947)
+++ trunk/mono/msvc/monograph.vcproj 2007-03-25 01:10:12 UTC (rev 74948)
@@ -67,9 +67,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib
gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib
Psapi.lib"
+ AdditionalDependencies="glib-2.0.lib
gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib mono.lib Psapi.lib"
LinkIncremental="1"
-
AdditionalLibraryDirectories="..\VSDependancies\lib"
+
AdditionalLibraryDirectories="..\VSDependancies\lib;bin/mono/$(PlatformName)/$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
Modified: trunk/mono/msvc/pedump.vcproj
===================================================================
--- trunk/mono/msvc/pedump.vcproj 2007-03-24 20:56:11 UTC (rev 74947)
+++ trunk/mono/msvc/pedump.vcproj 2007-03-25 01:10:12 UTC (rev 74948)
@@ -44,10 +44,10 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\;..\libgc\include;"..\VSDependancies\include\glib-2.0\glib";..\VSDependancies\include;..\mono\"
-
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"
+
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
BufferSecurityCheck="true"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)/pedump/"
@@ -70,9 +70,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib ws2_32.lib
gthread-2.0.lib libmono.lib Psapi.lib"
+ AdditionalDependencies="glib-2.0.lib ws2_32.lib
gthread-2.0.lib libgc.lib mono.lib Psapi.lib"
LinkIncremental="1"
-
AdditionalLibraryDirectories="../VSDependancies/lib;bin/mono/$(PlatformName)/$(ConfigurationName)"
+
AdditionalLibraryDirectories="../VSDependancies/lib;bin/mono/$(PlatformName)/$(ConfigurationName);.\lib\libgc\$(PlatformName)\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -348,10 +348,150 @@
<References>
</References>
<Files>
+ <Filter
+ Name="utils"
+ >
+ <File
+ RelativePath="..\mono\utils\strtod.c"
+ >
+ </File>
+ </Filter>
<File
+ RelativePath="..\mono\metadata\appdomain.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\assembly.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\boehm-gc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\class.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\console-io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\decimal.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\domain.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\environment.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\file-io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\filewatcher.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\gc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\icall.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\image.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\loader.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\locales.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\marshal.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\metadata.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\monitor.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\mono-config.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\utils\mono-dl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\object.c"
+ >
+ </File>
+ <File
RelativePath="..\mono\metadata\pedump.c"
>
</File>
+ <File
+ RelativePath="..\mono\metadata\process.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\profiler.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\rand.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\rawbuffer.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\reflection.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\security-manager.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\security.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\socket-io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\string-icalls.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\sysmath.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\threadpool.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mono\metadata\threads.c"
+ >
+ </File>
</Files>
<Globals>
</Globals>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
