Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/rx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Pouliot <sebastien@xamarin.com>2013-01-09 18:03:03 +0400
committerSebastien Pouliot <sebastien@xamarin.com>2013-01-09 18:03:03 +0400
commit34b84be2ed88fbea66e613d3151e6fbecefe2735 (patch)
tree307f21be20f7e7412cb550ff943f3a5267733b81
parent8dee06db27b04779be20f10b9950cb225df146b3 (diff)
Add required DEFINE when building for iOS devices and add a missing MONOTOUCH check (fix compilation)
-rw-r--r--Rx.NET/Rx_Xamarin/iOS/Tests.System.Reactive/ios_Tests.System.Reactive.csproj5
-rw-r--r--Rx.NET/Tests.System.Reactive/Utils.cs2
2 files changed, 4 insertions, 3 deletions
diff --git a/Rx.NET/Rx_Xamarin/iOS/Tests.System.Reactive/ios_Tests.System.Reactive.csproj b/Rx.NET/Rx_Xamarin/iOS/Tests.System.Reactive/ios_Tests.System.Reactive.csproj
index 5dca68a..621d458 100644
--- a/Rx.NET/Rx_Xamarin/iOS/Tests.System.Reactive/ios_Tests.System.Reactive.csproj
+++ b/Rx.NET/Rx_Xamarin/iOS/Tests.System.Reactive/ios_Tests.System.Reactive.csproj
@@ -39,13 +39,14 @@
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\iPhone\Debug</OutputPath>
- <DefineConstants>DEBUG;</DefineConstants>
+ <DefineConstants>DEBUG;NO_TASK_DELAY;NUNIT;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;MONOTOUCH</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodesignKey>iPhone Developer</CodesignKey>
- <MtouchProfiling>True</MtouchProfiling>
<ConsolePause>False</ConsolePause>
<MtouchDebug>True</MtouchDebug>
+ <MtouchI18n />
+ <MtouchArch>ARMv7</MtouchArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
diff --git a/Rx.NET/Tests.System.Reactive/Utils.cs b/Rx.NET/Tests.System.Reactive/Utils.cs
index 70cfd1b..bf44418 100644
--- a/Rx.NET/Tests.System.Reactive/Utils.cs
+++ b/Rx.NET/Tests.System.Reactive/Utils.cs
@@ -21,7 +21,7 @@ namespace ReactiveTests
public static string GetTestBaseDirectory()
{
-#if MONODROID
+#if MONODROID || MONOTOUCH
// There is no accessible file system inside android application.
return System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData);
#else