OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make option Prefer32bit default to false. Thanks Freaky Tech

httptests
UbitUmarov 2017-08-30 22:49:13 +01:00
parent 41e8b9f91f
commit 46ead8dcb2
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Prebuild/ChangeLog
View File

@ -1,3 +1,6 @@
2017, August Unit Umarov
* add Freak Tech patch for prefer32bit default to false
2015, June Fly-Man- <fly.man.opensim@gmail.com> 2015, June Fly-Man- <fly.man.opensim@gmail.com>
* V2.0.7 (WhiteCore Build) * V2.0.7 (WhiteCore Build)
* Added the VS2012/VS2013 targets so .Net 4.5 can be used for WhiteCore * Added the VS2012/VS2013 targets so .Net 4.5 can be used for WhiteCore

3
Prebuild/src/Core/Targets/VSGenericTarget.cs
View File

@ -235,7 +235,7 @@ namespace Prebuild.Core.Targets
ps.WriteLine(" <ConfigurationOverrideFile>"); ps.WriteLine(" <ConfigurationOverrideFile>");
ps.WriteLine(" </ConfigurationOverrideFile>"); ps.WriteLine(" </ConfigurationOverrideFile>");
ps.WriteLine(" <DefineConstants>{0}</DefineConstants>", 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(" <DocumentationFile>{0}</DocumentationFile>", Helper.NormalizePath(conf.Options["XmlDocFile"].ToString()));
ps.WriteLine(" <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]); ps.WriteLine(" <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
ps.WriteLine(" <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]); 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(" <NoStdLib>{0}</NoStdLib>", conf.Options["NoStdLib"]);
ps.WriteLine(" <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]); ps.WriteLine(" <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]);
ps.WriteLine(" <PlatformTarget>{0}</PlatformTarget>", conf.Platform); ps.WriteLine(" <PlatformTarget>{0}</PlatformTarget>", conf.Platform);
ps.WriteLine(" <Prefer32Bit>false</Prefer32Bit>");
ps.WriteLine(" </PropertyGroup>"); ps.WriteLine(" </PropertyGroup>");
} }

3
Prebuild/src/Properties/AssemblyInfo.cs
View File

@ -68,7 +68,8 @@ using System.Resources;
"Rob Loach, " + "Rob Loach, " +
"David Hudson," + "David Hudson," +
"John Hurliman" + "John Hurliman" +
"WhiteCore Development")] "WhiteCore Development" +
"OpenSimulator developers")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguageAttribute("en-US")] [assembly: NeutralResourcesLanguageAttribute("en-US")]