projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8888b09)
2007-03-10 Bill Holmes <billholmes54@gmail.com>
authorBill Holmes <holmes@mono-cvs.ximian.com>
Mon, 10 Mar 2008 17:38:01 +0000 (17:38 -0000)
committerBill Holmes <holmes@mono-cvs.ximian.com>
Mon, 10 Mar 2008 17:38:01 +0000 (17:38 -0000)
* generic-sharing.c:  Including glib.h for the MSVC builds to define
  "inline" to "__inline" before including mono-membar.h.

* mono-perfcounters.c:  Adding HAVE_SYS_TIME_H check for MSVC builds.
  Rename "Unknown" to "CatTypeUnknown" to avoid name collisions for
  MSVC builds.

* mono.sln: Fixing configuration list to build the correct targets for the
  specified configuration.

* runburg.bat, runmdesc.bat:  Changing the PATH environment variable assignment
  to the correct location.

* libmono.vcproj:  Adding missing files.

Contributed under MIT/X11 license.

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

mono/metadata/ChangeLog patch | blob | history
mono/metadata/generic-sharing.c patch | blob | history
mono/metadata/mono-perfcounters.c patch | blob | history
msvc/ChangeLog patch | blob | history
msvc/libmono.vcproj patch | blob | history
msvc/mono.sln patch | blob | history
msvc/runburg.bat patch | blob | history
msvc/runmdesc.bat patch | blob | history

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 99480f40b2a8967e6d670a6936cb5dbeb3b00bfe..23e98065da628580c0fd1f77ef060b5a4bf9332c 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-10  Bill Holmes  <billholmes54@gmail.com>
+
+       * generic-sharing.c:  Including glib.h for the MSVC builds to define
+         "inline" to "__inline" before including mono-membar.h.
+         
+       * mono-perfcounters.c:  Adding HAVE_SYS_TIME_H check for MSVC builds.
+         Rename "Unknown" to "CatTypeUnknown" to avoid name collisions for 
+         MSVC builds.
+
+       Contributed under MIT/X11 license.
+
 2008-03-10 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * verify.c (do_invoke_method): Remove return type validation.
diff --git a/mono/metadata/generic-sharing.c b/mono/metadata/generic-sharing.c
index 07fe18e0f503f0d3727aa76864f80d057fcdd879..5d501b8553cb574a403b9b8c9153796d528d36ab 100644 (file)
--- a/mono/metadata/generic-sharing.c
+++ b/mono/metadata/generic-sharing.c
@@ -10,6 +10,9 @@
 #include <config.h>
 #include <string.h>
 
+#ifdef _MSC_VER
+#include <glib.h>
+#endif
 #include <mono/utils/mono-membar.h>
 
 #include "metadata-internals.h"
diff --git a/mono/metadata/mono-perfcounters.c b/mono/metadata/mono-perfcounters.c
index 3d4b70edb3038ebfe19632fc1f5e85de4bba9669..b380ced4ba8376e5ceed0616482059552d39163f 100644 (file)
--- a/mono/metadata/mono-perfcounters.c
+++ b/mono/metadata/mono-perfcounters.c
@@ -12,7 +12,9 @@
 #include <time.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
 #include "metadata/mono-perfcounters.h"
 #include "metadata/appdomain.h"
 /* for mono_stats */
@@ -67,7 +69,7 @@ enum {
 enum {
        SingleInstance,
        MultiInstance,
-       Unknown = -1
+       CatTypeUnknown = -1
 };
 
 #define PERFCTR_CAT(id,name,help,type,first_counter) CATEGORY_ ## id,
diff --git a/msvc/ChangeLog b/msvc/ChangeLog
index f7d1622fdafa46c6869035c64343e36a96870218..001735bed45ba8c3ac7afbcbf2aa13be9db91b51 100755 (executable)
--- a/msvc/ChangeLog
+++ b/msvc/ChangeLog
@@ -1,3 +1,15 @@
+2007-03-10  Bill Holmes  <billholmes54@gmail.com>
+
+       * mono.sln: Fixing configuration list to build the correct targets for the 
+         specified configuration.
+
+       * runburg.bat, runmdesc.bat:  Changing the PATH environment variable assignment 
+         to the correct location.
+
+       * libmono.vcproj:  Adding missing files.
+
+       Contributed under MIT/X11 license.
+
 2007-12-31  Jonathan Chambers  <joncham@gmail.com>
 
        * mono.sln, libmono.vcproj, mono.vcproj, mono.def: Update .def
diff --git a/msvc/libmono.vcproj b/msvc/libmono.vcproj
index 1e7dee21da372cc52dac5619db6752de3c2079d4..a205234078da2754ee053e32ad3e61bc8b17b3b6 100644 (file)
--- a/msvc/libmono.vcproj
+++ b/msvc/libmono.vcproj
@@ -1605,6 +1605,14 @@
                                RelativePath="..\mono\utils\mono-stdlib.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mono\utils\mono-time.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\mono\utils\mono-time.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\mono\utils\mono-uri.c"\r
                                >\r
@@ -3101,6 +3109,114 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mono\metadata\generic-sharing.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug_eglib|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug_eglib|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release_eglib|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release_eglib|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
                        <File\r
                                RelativePath="..\mono\metadata\icall.c"\r
                                >\r
@@ -4197,6 +4313,14 @@
                                RelativePath="..\mono\metadata\mono-mlist.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mono\metadata\mono-perfcounters.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\mono\metadata\mono-perfcounters.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\mono\metadata\object-internals.h"\r
                                >\r
@@ -6144,6 +6268,90 @@
                        <File\r
                                RelativePath="..\mono\mini\generic-sharing.c"\r
                                >\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug_eglib|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug_eglib|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release_eglib|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release_eglib|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\mono\mini\graph.c"\r
diff --git a/msvc/mono.sln b/msvc/mono.sln
index 4e8f00a15db52fb3826ac8e9bbe664a93c04db8a..7a63fc1fcb07101af62cd536165537b2f6b21be0 100644 (file)
--- a/msvc/mono.sln
+++ b/msvc/mono.sln
@@ -73,6 +73,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{ECA11C76-E192-4F67-A8FA-28B637D9716F}"\r
 EndProject\r
 Global\r
+       GlobalSection(DPCodeReviewSolutionGUID) = preSolution\r
+               DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}\r
+       EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug_eglib|Any CPU = Debug_eglib|Any CPU\r
                Debug_eglib|Mixed Platforms = Debug_eglib|Mixed Platforms\r
@@ -125,8 +128,8 @@ Global
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug_eglib|Mixed Platforms.Build.0 = Debug|x64\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug_eglib|Win32.ActiveCfg = Debug_eglib|Win32\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug_eglib|Win32.Build.0 = Debug_eglib|Win32\r
-               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug_eglib|x64.ActiveCfg = Debug|x64\r
-               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug_eglib|x64.Build.0 = Debug|x64\r
+               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug_eglib|x64.ActiveCfg = Debug_eglib|x64\r
+               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug_eglib|x64.Build.0 = Debug_eglib|x64\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
@@ -137,9 +140,9 @@ Global
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release_eglib|Any CPU.ActiveCfg = Release|x64\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release_eglib|Mixed Platforms.ActiveCfg = Release|x64\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release_eglib|Mixed Platforms.Build.0 = Release|x64\r
-               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release_eglib|Win32.ActiveCfg = Release|Win32\r
-               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release_eglib|x64.ActiveCfg = Release|x64\r
-               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release_eglib|x64.Build.0 = Release|x64\r
+               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release_eglib|Win32.ActiveCfg = Release_eglib|Win32\r
+               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release_eglib|x64.ActiveCfg = Release_eglib|x64\r
+               {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release_eglib|x64.Build.0 = Release_eglib|x64\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|Any CPU.ActiveCfg = Release|Win32\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|Mixed Platforms.Build.0 = Release|Win32\r
@@ -202,10 +205,10 @@ Global
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|Any CPU.ActiveCfg = Debug|x64\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|Mixed Platforms.ActiveCfg = Debug|x64\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|Mixed Platforms.Build.0 = Debug|x64\r
-               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|Win32.ActiveCfg = Debug|Win32\r
-               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|Win32.Build.0 = Debug|Win32\r
-               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|x64.ActiveCfg = Debug|x64\r
-               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|x64.Build.0 = Debug|x64\r
+               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|Win32.ActiveCfg = Debug_eglib|Win32\r
+               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|Win32.Build.0 = Debug_eglib|Win32\r
+               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|x64.ActiveCfg = Debug_eglib|x64\r
+               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug_eglib|x64.Build.0 = Debug_eglib|x64\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
@@ -216,9 +219,9 @@ Global
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release_eglib|Any CPU.ActiveCfg = Release|x64\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release_eglib|Mixed Platforms.ActiveCfg = Release|x64\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release_eglib|Mixed Platforms.Build.0 = Release|x64\r
-               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release_eglib|Win32.ActiveCfg = Release|Win32\r
-               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release_eglib|x64.ActiveCfg = Release|x64\r
-               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release_eglib|x64.Build.0 = Release|x64\r
+               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release_eglib|Win32.ActiveCfg = Release_eglib|Win32\r
+               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release_eglib|x64.ActiveCfg = Release_eglib|x64\r
+               {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release_eglib|x64.Build.0 = Release_eglib|x64\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release|Any CPU.ActiveCfg = Release|Win32\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {A0EDDCD9-940F-432C-A28F-7EF322437D79}.Release|Mixed Platforms.Build.0 = Release|Win32\r
@@ -336,8 +339,8 @@ Global
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug_eglib|Mixed Platforms.Build.0 = Debug|x64\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug_eglib|Win32.ActiveCfg = Debug_eglib|Win32\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug_eglib|Win32.Build.0 = Debug_eglib|Win32\r
-               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug_eglib|x64.ActiveCfg = Debug|x64\r
-               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug_eglib|x64.Build.0 = Debug|x64\r
+               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug_eglib|x64.ActiveCfg = Debug_eglib|x64\r
+               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug_eglib|x64.Build.0 = Debug_eglib|x64\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
@@ -348,9 +351,9 @@ Global
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release_eglib|Any CPU.ActiveCfg = Release|x64\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release_eglib|Mixed Platforms.ActiveCfg = Release|x64\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release_eglib|Mixed Platforms.Build.0 = Release|x64\r
-               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release_eglib|Win32.ActiveCfg = Release|Win32\r
-               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release_eglib|x64.ActiveCfg = Release|x64\r
-               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release_eglib|x64.Build.0 = Release|x64\r
+               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release_eglib|Win32.ActiveCfg = Release_eglib|Win32\r
+               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release_eglib|x64.ActiveCfg = Release_eglib|x64\r
+               {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release_eglib|x64.Build.0 = Release_eglib|x64\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release|Any CPU.ActiveCfg = Release|Win32\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {5DCFA645-3358-4A20-9630-AEAAC5EED2D5}.Release|Mixed Platforms.Build.0 = Release|Win32\r
@@ -479,7 +482,4 @@ Global
                {C2EB666E-9146-4B7A-85F6-25F9EA313770} = {5FE09AA5-C3C9-45EA-A323-36A11B653CEC}\r
                {80A0620A-3478-4E1A-AA7C-0D2387B892AB} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}\r
        EndGlobalSection\r
-       GlobalSection(DPCodeReviewSolutionGUID) = preSolution\r
-               DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}\r
-       EndGlobalSection\r
 EndGlobal\r
diff --git a/msvc/runburg.bat b/msvc/runburg.bat
index d7abbcd0642d323bf1ec8cfd6544afdd31bc65ab..69ba79c0f2d2dc08162398fe28e1ab90818250c8 100755 (executable)
--- a/msvc/runburg.bat
+++ b/msvc/runburg.bat
@@ -2,7 +2,7 @@
 rem This runs Monoburg on the various x86 files when called on Visual Studio
 echo Running Monoburg on the inssel.brg files...
 cd ..\mono\mini
-set PATH=%PATH%;%MONO_DEPENDENCIES_PREFIX%\bin
+set PATH=%PATH%;%MONO_DEPENDENCIES_PREFIX%\lib
 
 if "%2" == "Win32" goto x86
 if "%2" == "x64" goto x64
diff --git a/msvc/runmdesc.bat b/msvc/runmdesc.bat
index db0179b8f2deb7764020198dc52f4b3fa543372e..1efcdfbf20a987e169d0500815439f71135aba4e 100755 (executable)
--- a/msvc/runmdesc.bat
+++ b/msvc/runmdesc.bat
@@ -2,7 +2,7 @@
 rem This runs genmdesc on the x86 files when called on Visual Studio
 echo Running genmdesc
 cd ..\mono\mini
-set PATH=%PATH%;%MONO_DEPENDENCIES_PREFIX%\bin
+set PATH=%PATH%;%MONO_DEPENDENCIES_PREFIX%\lib
 if "%2" == "Win32" goto x86
 if "%2" == "x64" goto x64
 goto error
my mono mirror. check out Moved to http://github.com/mono/mono