diff options
author | UbitUmarov | 2017-08-31 15:17:42 +0100 |
---|---|---|
committer | UbitUmarov | 2017-08-31 15:17:42 +0100 |
commit | 3fe3471532db22eeb0d75c2b0ab56e6d2fc3eea8 (patch) | |
tree | d5fedd34bb891fd896fd90f8b8608f09c4c98711 | |
parent | .net4.5, take2; vs2010 does not do it, try to make mono5.x msbuild more happy (diff) | |
download | opensim-SC-3fe3471532db22eeb0d75c2b0ab56e6d2fc3eea8.zip opensim-SC-3fe3471532db22eeb0d75c2b0ab56e6d2fc3eea8.tar.gz opensim-SC-3fe3471532db22eeb0d75c2b0ab56e6d2fc3eea8.tar.bz2 opensim-SC-3fe3471532db22eeb0d75c2b0ab56e6d2fc3eea8.tar.xz |
improve Prefer32bit configuration option
Diffstat (limited to '')
-rw-r--r-- | Prebuild/src/Core/Nodes/OptionsNode.cs | 18 | ||||
-rw-r--r-- | Prebuild/src/Core/Targets/VSGenericTarget.cs | 2 | ||||
-rw-r--r-- | Prebuild/src/data/prebuild-1.10.xsd | 5 | ||||
-rwxr-xr-x | bin/Prebuild.exe | bin | 249856 -> 249856 bytes | |||
-rw-r--r-- | prebuild.xml | 2 |
5 files changed, 24 insertions, 3 deletions
diff --git a/Prebuild/src/Core/Nodes/OptionsNode.cs b/Prebuild/src/Core/Nodes/OptionsNode.cs index 577de71..490fd6f 100644 --- a/Prebuild/src/Core/Nodes/OptionsNode.cs +++ b/Prebuild/src/Core/Nodes/OptionsNode.cs | |||
@@ -277,6 +277,24 @@ namespace Prebuild.Core.Nodes | |||
277 | m_SuppressWarnings = value; | 277 | m_SuppressWarnings = value; |
278 | } | 278 | } |
279 | } | 279 | } |
280 | |||
281 | [OptionNode("Prefer32Bit")] | ||
282 | private bool m_Prefer32Bit; | ||
283 | |||
284 | /// <summary> | ||
285 | /// | ||
286 | /// </summary> | ||
287 | public bool Prefer32Bit | ||
288 | { | ||
289 | get | ||
290 | { | ||
291 | return m_Prefer32Bit; | ||
292 | } | ||
293 | set | ||
294 | { | ||
295 | m_Prefer32Bit = value; | ||
296 | } | ||
297 | } | ||
280 | 298 | ||
281 | [OptionNode("OutputPath")] | 299 | [OptionNode("OutputPath")] |
282 | private string m_OutputPath = "bin/"; | 300 | private string m_OutputPath = "bin/"; |
diff --git a/Prebuild/src/Core/Targets/VSGenericTarget.cs b/Prebuild/src/Core/Targets/VSGenericTarget.cs index 424e4d1..c12120f 100644 --- a/Prebuild/src/Core/Targets/VSGenericTarget.cs +++ b/Prebuild/src/Core/Targets/VSGenericTarget.cs | |||
@@ -254,7 +254,7 @@ namespace Prebuild.Core.Targets | |||
254 | ps.WriteLine(" <NoStdLib>{0}</NoStdLib>", conf.Options["NoStdLib"]); | 254 | ps.WriteLine(" <NoStdLib>{0}</NoStdLib>", conf.Options["NoStdLib"]); |
255 | ps.WriteLine(" <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]); | 255 | ps.WriteLine(" <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]); |
256 | ps.WriteLine(" <PlatformTarget>{0}</PlatformTarget>", conf.Platform); | 256 | ps.WriteLine(" <PlatformTarget>{0}</PlatformTarget>", conf.Platform); |
257 | ps.WriteLine(" <Prefer32Bit>false</Prefer32Bit>"); | 257 | ps.WriteLine(" <Prefer32Bit>{0}</Prefer32Bit>",conf.Options["Prefer32Bit"]); |
258 | ps.WriteLine(" </PropertyGroup>"); | 258 | ps.WriteLine(" </PropertyGroup>"); |
259 | } | 259 | } |
260 | 260 | ||
diff --git a/Prebuild/src/data/prebuild-1.10.xsd b/Prebuild/src/data/prebuild-1.10.xsd index eee07a8..ddfa2c5 100644 --- a/Prebuild/src/data/prebuild-1.10.xsd +++ b/Prebuild/src/data/prebuild-1.10.xsd | |||
@@ -186,8 +186,9 @@ | |||
186 | <xs:complexType> | 186 | <xs:complexType> |
187 | <xs:all> | 187 | <xs:all> |
188 | <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" /> | 188 | <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" /> |
189 | <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" /> | 189 | <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" /> |
190 | <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" /> | 190 | <xs:element name="Prefer32Bit" type="xs:boolean" minOccurs="0" /> |
191 | <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" /> | ||
191 | <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" /> | 192 | <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" /> |
192 | <xs:element name="PreBuildEvent" type="xs:string" minOccurs="0" /> | 193 | <xs:element name="PreBuildEvent" type="xs:string" minOccurs="0" /> |
193 | <xs:element name="PostBuildEvent" type="xs:string" minOccurs="0" /> | 194 | <xs:element name="PostBuildEvent" type="xs:string" minOccurs="0" /> |
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index 2258d3d..98da714 100755 --- a/bin/Prebuild.exe +++ b/bin/Prebuild.exe | |||
Binary files differ | |||
diff --git a/prebuild.xml b/prebuild.xml index 2ee87f0..2d65db4 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -14,6 +14,7 @@ | |||
14 | <DebugInformation>true</DebugInformation> | 14 | <DebugInformation>true</DebugInformation> |
15 | <IncrementalBuild>true</IncrementalBuild> | 15 | <IncrementalBuild>true</IncrementalBuild> |
16 | <NoStdLib>false</NoStdLib> | 16 | <NoStdLib>false</NoStdLib> |
17 | <Prefer32Bit>false</Prefer32Bit> | ||
17 | </Options> | 18 | </Options> |
18 | </Configuration> | 19 | </Configuration> |
19 | <Configuration name="Release"> | 20 | <Configuration name="Release"> |
@@ -29,6 +30,7 @@ | |||
29 | <DebugInformation>false</DebugInformation> | 30 | <DebugInformation>false</DebugInformation> |
30 | <IncrementalBuild>true</IncrementalBuild> | 31 | <IncrementalBuild>true</IncrementalBuild> |
31 | <NoStdLib>false</NoStdLib> | 32 | <NoStdLib>false</NoStdLib> |
33 | <Prefer32Bit>false</Prefer32Bit> | ||
32 | </Options> | 34 | </Options> |
33 | </Configuration> | 35 | </Configuration> |
34 | 36 | ||