fix Cocoa sample

xamarin · Feb 21, 2018 · a21c9f0 · a21c9f0
1 parent 82d41bc
commit a21c9f0
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 11 deletions.
diff --git a/FeatureSamples/Cocoa/ViewController.cs b/FeatureSamples/Cocoa/ViewController.cs
@@ -48,15 +48,19 @@ public override async void ViewDidLoad()
 			UrhoSurface.AddSubview(view);
 
 			string assets = "../../../../../Assets";
-			Urho.Desktop.DesktopUrhoInitializer.CopyEmbeddedCoreDataTo(assets);
+			string coreDataPak = "../../../CoreData.pak";
+			if (!File.Exists(coreDataPak))
+				File.Copy("../../../CoreData.pak", Path.Combine(assets, "CoreData.pak"));
+
 			options = new ApplicationOptions("Data")
 				{
 					ExternalWindow = view.Handle,
 					LimitFps = true,
+					HighDpi = true,
 					ResourcePrefixPaths = new string[] { assets },
 				};
 		}
-
+		
 		async void RunSample(Type type)
 		{
 			if (currentApp != null)

diff --git a/FeatureSamples/FeatureSamples.userprefs b/FeatureSamples/FeatureSamples.userprefs
@@ -0,0 +1,21 @@
+<Properties StartupConfiguration="{75FEADAF-C698-4691-A1B9-48C5F04837FE}|Default">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Core/Sample.cs">
+    <Files>
+      <File FileName="Core/01_HelloWorld/HelloWorld.cs" Line="23" Column="12" />
+      <File FileName="Cocoa/ViewController.cs" Line="62" Column="4" />
+      <File FileName="Cocoa/Main.cs" Line="14" Column="1" />
+      <File FileName="Core/Sample.cs" Line="115" Column="1" />
+    </Files>
+  </MonoDevelop.Ide.Workbench>
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
+  <MonoDevelop.Ide.ItemProperties.Urho.Samples.Droid PreferredExecutionTarget="Android.Android_Accelerated_Nougat" />
+  <MonoDevelop.Ide.DebuggingService.Breakpoints>
+    <BreakpointStore>
+      <Catchpoint exceptionName="System.Exception" includeSubclasses="True" />
+    </BreakpointStore>
+  </MonoDevelop.Ide.DebuggingService.Breakpoints>
+  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+  <MonoDevelop.Ide.ItemProperties.Urho.Samples.iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.67372373-C96B-4133-B288-8AE80F8700C3" />
+  <MultiItemStartupConfigurations />
+  <MonoDevelop.Ide.ItemProperties.Urho.Samples.Cocoa PreferredExecutionTarget="Test1" />
+</Properties>
diff --git a/FeatureSamples/iOS/Urho.Samples.iOS.csproj b/FeatureSamples/iOS/Urho.Samples.iOS.csproj
@@ -21,10 +21,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchI18n>
     </MtouchI18n>
     <OptimizePNGs>false</OptimizePNGs>

diff --git a/FormsSample/FormsSample.iOS/FormsSample.iOS.csproj b/FormsSample/FormsSample.iOS/FormsSample.iOS.csproj
@@ -24,16 +24,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
-    <MtouchSdkVersion />
     <MtouchProfiling>False</MtouchProfiling>
     <MtouchFastDev>False</MtouchFastDev>
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchFloat32>False</MtouchFloat32>
     <MtouchI18n />
@@ -47,14 +44,11 @@
     <MtouchLink>None</MtouchLink>
     <MtouchArch>i386</MtouchArch>
     <ConsolePause>false</ConsolePause>
-    <MtouchSdkVersion />
     <MtouchDebug>False</MtouchDebug>
     <MtouchProfiling>False</MtouchProfiling>
     <MtouchFastDev>False</MtouchFastDev>
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
     <MtouchFloat32>False</MtouchFloat32>
     <MtouchI18n />
@@ -126,6 +120,7 @@
   <ItemGroup>
     <ProjectReference Include="..\FormsSample\FormsSample.csproj">
       <Name>FormsSample</Name>
+      <Project>{8DD49470-0958-42D9-841F-F15589DC9F99}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/FormsSample/FormsSample.userprefs b/FormsSample/FormsSample.userprefs
@@ -0,0 +1,11 @@
+<Properties StartupConfiguration="{0E081AC0-969F-4724-A9FD-B76C2E8A55E8}|Default">
+  <MonoDevelop.Ide.Workbench />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
+  <MonoDevelop.Ide.ItemProperties.FormsSample.iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.A8DB8ED8-C845-4B8E-9643-5310EFAF35C4" />
+  <MonoDevelop.Ide.DebuggingService.Breakpoints>
+    <BreakpointStore />
+  </MonoDevelop.Ide.DebuggingService.Breakpoints>
+  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+  <MonoDevelop.Ide.ItemProperties.FormsSample.Droid PreferredExecutionTarget="Android.Android_Accelerated_Nougat" />
+  <MultiItemStartupConfigurations />
+</Properties>