From 46ead8dcb2661024fb2f9affe96c38f11c61dfeb Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 30 Aug 2017 22:49:13 +0100
Subject: make option Prefer32bit default to false. Thanks Freaky Tech

---
 Prebuild/src/Core/Targets/VSGenericTarget.cs | 3 ++-
 Prebuild/src/Properties/AssemblyInfo.cs      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'Prebuild/src')

diff --git a/Prebuild/src/Core/Targets/VSGenericTarget.cs b/Prebuild/src/Core/Targets/VSGenericTarget.cs
index b8904ad..570c3a4 100644
--- a/Prebuild/src/Core/Targets/VSGenericTarget.cs
+++ b/Prebuild/src/Core/Targets/VSGenericTarget.cs
@@ -235,7 +235,7 @@ namespace Prebuild.Core.Targets
 					ps.WriteLine("	  <ConfigurationOverrideFile>");
 					ps.WriteLine("	  </ConfigurationOverrideFile>");
 					ps.WriteLine("	  <DefineConstants>{0}</DefineConstants>",
-                        conf.Options["CompilerDefines"] == "" ? this.kernel.ForcedConditionals : conf.Options["CompilerDefines"] + ";" + kernel.ForcedConditionals);
+                        conf.Options["CompilerDefines"].ToString() == "" ? this.kernel.ForcedConditionals : conf.Options["CompilerDefines"] + ";" + kernel.ForcedConditionals);
 					ps.WriteLine("	  <DocumentationFile>{0}</DocumentationFile>", Helper.NormalizePath(conf.Options["XmlDocFile"].ToString()));
 					ps.WriteLine("	  <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
 					ps.WriteLine("	  <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);
@@ -254,6 +254,7 @@ namespace Prebuild.Core.Targets
 					ps.WriteLine("	  <NoStdLib>{0}</NoStdLib>", conf.Options["NoStdLib"]);
 					ps.WriteLine("	  <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]);
 					ps.WriteLine("	  <PlatformTarget>{0}</PlatformTarget>", conf.Platform);
+                    ps.WriteLine("    <Prefer32Bit>false</Prefer32Bit>");
 					ps.WriteLine("	</PropertyGroup>");
 				}
 
diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
index ebb832a..079d6a5 100644
--- a/Prebuild/src/Properties/AssemblyInfo.cs
+++ b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -68,7 +68,8 @@ using System.Resources;
                              "Rob Loach, " +
                              "David Hudson," +
                              "John Hurliman" +
-                             "WhiteCore Development")]
+                             "WhiteCore Development" +
+                             "OpenSimulator developers")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
-- 
cgit v1.1