Fixed build for TARGET_JVM.

svn path=/trunk/mcs/; revision=48646

diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs
index 555e89b02d08706613203b9aea91b692971ffe38..dbf3b719e5e483658735fcc4018880c15da34c4b 100644 (file)
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@@ -51,7 +51,7 @@ internal
 #if NET_2_0 || BOOTSTRAP_NET_2_0\r
        public const string FxVersion = "2.0.0.0";\r
        public const string VsVersion = "8.0.0.0";\r
-#elif NET_1_1\r
+#elif NET_1_1 || TARGET_JVM\r
        public const string FxVersion = "1.0.5000.0";\r
        public const string VsVersion = "7.0.5000.0";\r
 #elif NET_1_0\r

diff --git a/mcs/class/System.DirectoryServices/ChangeLog b/mcs/class/System.DirectoryServices/ChangeLog
index 8232323c44151ee746aa17f5c7f03c28afa52525..74cee89f5f613d0b6f26b04b8058084eec010905 100644 (file)
--- a/mcs/class/System.DirectoryServices/ChangeLog
+++ b/mcs/class/System.DirectoryServices/ChangeLog
@@ -1,3 +1,6 @@
+2005-22-08  Boris Kirzner <borisk@mainsoft.com>
+       * System.DirectoryServices.vmwcsproj: changed reference to Consts.cs.
+
 2005-14-08  Boris Kirzner <borisk@mainsoft.com>
        * App.config: added "authenticationmech" supported key example.
 

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj b/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj
index 003fbbdf1ea8209c2002cfed44c7acfea3f9a852..4ed84a93ea79d1b25470493d68553c12c941d749 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj
@@ -13,11 +13,11 @@
                </Build>\r
                <Files>\r
                        <Include>\r
+                               <File RelPath="Consts.cs" Link="..\..\build\common\Consts.cs" SubType="Code" BuildAction="Compile"/>\r
                                <File RelPath="Locale.cs" Link="..\..\build\common\Locale.cs" SubType="Code" BuildAction="Compile"/>\r
                                <File RelPath="MonoTODOAttribute.cs" Link="..\..\build\common\MonoTODOAttribute.cs" SubType="Code" BuildAction="Compile"/>\r
                                <File RelPath="Assembly\AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>\r
                                <File RelPath="Assembly\ChangeLog" BuildAction="None"/>\r
-                               <File RelPath="Assembly\Consts.cs" SubType="Code" BuildAction="Compile"/>\r
                                <File RelPath="System.DirectoryServices\AuthenticationTypes.cs" SubType="Code" BuildAction="Compile"/>\r
                                <File RelPath="System.DirectoryServices\ChangeLog" BuildAction="None"/>\r
                                <File RelPath="System.DirectoryServices\DirectoryEntries.cs" SubType="Code" BuildAction="Compile"/>\r