2007-03-25 Marek Safar <marek.safar@gmail.com>

	* monodiet.vcproj, monodis.vcproj, monograph.vcproj, pedump.vsproj:
	Fixed build.

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

diff --git a/msvc/ChangeLog b/msvc/ChangeLog
index 76e6de85778349626f68888c3953ff3459c7531e..b90da0605808659613c17857aaf5a5e091c5b45a 100755 (executable)
--- a/msvc/ChangeLog
+++ b/msvc/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-25  Marek Safar  <marek.safar@gmail.com>
+
+       * monodiet.vcproj, monodis.vcproj, monograph.vcproj, pedump.vsproj:\r
+       Fixed build.\r
+\r
 2007-03-19  Jonathan Chambers  <joncham@gmail.com>
 
        * libmono.vcproj, genmdesc.vcproj: Reset browse information

diff --git a/msvc/monodiet.vcproj b/msvc/monodiet.vcproj
index 67e9aa280b133d04b01473d485e1f5b144ccad2d..0c6cc5307460cdea8ef1d0796f7ce265e0bd1232 100644 (file)
--- a/msvc/monodiet.vcproj
+++ b/msvc/monodiet.vcproj
@@ -44,7 +44,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\;..\libgc\include;"..\VSDependancies\include\glib-2.0\glib";..\VSDependancies\include;..\mono\"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"\r
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
@@ -70,9 +70,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib"\r
+                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib mono.lib Psapi.lib"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="..\;..\VSDependancies\lib"\r
+                               AdditionalLibraryDirectories="..\;..\VSDependancies\lib;bin\mono\$(PlatformName)\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -103,9 +103,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="Release"\r
-                       IntermediateDirectory="Release"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -123,17 +123,26 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
-                               RuntimeLibrary="2"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\;..\libgc\include;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;..\mono\"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
                                BufferSecurityCheck="true"\r
                                UsePrecompiledHeader="0"\r
+                               ObjectFile="$(IntDir)/monodiet/"\r
+                               ProgramDataBaseFileName="$(IntDir)/monodiet/vc80.pdb"\r
+                               XMLDocumentationFileName="$(IntDir)/monodiet/"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -146,12 +155,12 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="..\;..\VSDependancies\lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -179,9 +188,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -199,26 +208,17 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\;..\libgc\include;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;..\mono\"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               Optimization="2"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="true"\r
                                UsePrecompiledHeader="0"\r
-                               ObjectFile="$(IntDir)/monodiet/"\r
-                               ProgramDataBaseFileName="$(IntDir)/monodiet/vc80.pdb"\r
-                               XMLDocumentationFileName="$(IntDir)/monodiet/"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
-                               CompileAs="1"\r
-                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -231,12 +231,12 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="..\;..\VSDependancies\lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -348,6 +348,10 @@
                        RelativePath="..\mono\metadata\monodiet.c"\r
                        >\r
                </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\opcodes.c"\r
+                       >\r
+               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r

diff --git a/msvc/monodis.vcproj b/msvc/monodis.vcproj
index f7a989a7cb5f1eec4995382975d1e70b8bea6361..05331526da91f32e87cf27d3c9c84f73cceb266c 100644 (file)
--- a/msvc/monodis.vcproj
+++ b/msvc/monodis.vcproj
@@ -67,9 +67,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib"\r
+                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib mono.lib Psapi.lib"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="..\VSDependancies\lib"\r
+                               AdditionalLibraryDirectories="..\VSDependancies\lib;bin/mono/$(PlatformName)/$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r

diff --git a/msvc/monograph.vcproj b/msvc/monograph.vcproj
index b627f088d8f0b00efac272846e1c1ff490f0c520..7dafedf2f7ae60beeffe18a0e71a80eaaf0c0eb7 100644 (file)
--- a/msvc/monograph.vcproj
+++ b/msvc/monograph.vcproj
@@ -67,9 +67,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib libmono.lib Psapi.lib"\r
+                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib ws2_32.lib gthread-2.0.lib gobject-2.0.lib mono.lib Psapi.lib"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="..\VSDependancies\lib"\r
+                               AdditionalLibraryDirectories="..\VSDependancies\lib;bin/mono/$(PlatformName)/$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r

diff --git a/msvc/pedump.vcproj b/msvc/pedump.vcproj
index 30eb95292da7a517c7cc9102ada4729c3f409e0f..ae8ab11f3440fb1728a4ca5a89f1112f51c447d6 100644 (file)
--- a/msvc/pedump.vcproj
+++ b/msvc/pedump.vcproj
@@ -44,10 +44,10 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\;..\libgc\include;"..\VSDependancies\include\glib-2.0\glib";..\VSDependancies\include;..\mono\"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;PLATFORM_WIN32;__i386__;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                BufferSecurityCheck="true"\r
                                UsePrecompiledHeader="0"\r
                                ObjectFile="$(IntDir)/pedump/"\r
@@ -70,9 +70,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib libmono.lib Psapi.lib"\r
+                               AdditionalDependencies="glib-2.0.lib ws2_32.lib gthread-2.0.lib libgc.lib mono.lib Psapi.lib"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="../VSDependancies/lib;bin/mono/$(PlatformName)/$(ConfigurationName)"\r
+                               AdditionalLibraryDirectories="../VSDependancies/lib;bin/mono/$(PlatformName)/$(ConfigurationName);.\lib\libgc\$(PlatformName)\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -348,10 +348,150 @@
        <References>\r
        </References>\r
        <Files>\r
+               <Filter\r
+                       Name="utils"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\mono\utils\strtod.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <File\r
+                       RelativePath="..\mono\metadata\appdomain.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\assembly.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\boehm-gc.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\class.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\console-io.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\decimal.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\domain.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\environment.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\file-io.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\filewatcher.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\gc.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\icall.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\image.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\loader.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\locales.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\marshal.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\metadata.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\monitor.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\mono-config.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\utils\mono-dl.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\object.c"\r
+                       >\r
+               </File>\r
                <File\r
                        RelativePath="..\mono\metadata\pedump.c"\r
                        >\r
                </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\process.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\profiler.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\rand.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\rawbuffer.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\reflection.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\security-manager.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\security.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\socket-io.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\string-icalls.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\sysmath.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\threadpool.c"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\mono\metadata\threads.c"\r
+                       >\r
+               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r