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

[mono.git] / msvc / monodiet.vcproj

diff --git a/msvc/monodiet.vcproj b/msvc/monodiet.vcproj
index 67e9aa280b133d04b01473d485e1f5b144ccad2d..1178360484fa9a9ddbacda34f6e2dc1e7425014b 100644 (file)
--- a/msvc/monodiet.vcproj
+++ b/msvc/monodiet.vcproj
@@ -20,8 +20,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="../VSDependancies/temp/monodiet/Debug"\r
-                       IntermediateDirectory="../VSDependancies/temp/monodiet/Debug"\r
+                       OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
+                       IntermediateDirectory="./obj/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -44,7 +44,7 @@
                                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
+                               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="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
+                       IntermediateDirectory="./obj/$(ProjectName)/$(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="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
+                       IntermediateDirectory="./obj/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\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
@@ -265,8 +265,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
+                       IntermediateDirectory="./obj/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\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