Merge branch 'master' of https://github.com/mono/monotouch-bindings

mono · Nov 15, 2013 · 23eaf5f · 23eaf5f
2 parents 27397dd + 0972493
commit 23eaf5f
Show file tree

Hide file tree

Showing 692 changed files with 23,615 additions and 6,583 deletions.
diff --git a/ATMHud/binding/ATMHud.dll b/ATMHud/binding/ATMHud.dll
diff --git a/ATMHud/sample/MonoTouch.Dialog.dll b/ATMHud/sample/MonoTouch.Dialog.dll
diff --git a/ATMHud/sample/19-check.png → ATMHud/samples/ATMHudSample/19-check.png b/ATMHud/sample/19-check.png → ATMHud/samples/ATMHudSample/19-check.png
diff --git a/ATMHud/sample/AppDelegate.cs → ATMHud/samples/ATMHudSample/AppDelegate.cs b/ATMHud/sample/AppDelegate.cs → ATMHud/samples/ATMHudSample/AppDelegate.cs
diff --git a/ATMHud/sample/Info.plist → ATMHud/samples/ATMHudSample/Info.plist b/ATMHud/sample/Info.plist → ATMHud/samples/ATMHudSample/Info.plist
diff --git a/ATMHud/sample/pop.wav → ATMHud/samples/ATMHudSample/pop.wav b/ATMHud/sample/pop.wav → ATMHud/samples/ATMHudSample/pop.wav
diff --git a/ATMHud/sample/sample.csproj → ATMHud/samples/ATMHudSample/sample.csproj b/ATMHud/sample/sample.csproj → ATMHud/samples/ATMHudSample/sample.csproj
@@ -60,10 +60,10 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="monotouch" />
+    <Reference Include="MonoTouch.Dialog-1" />
     <Reference Include="ATMHud">
-      <HintPath>..\binding\ATMHud.dll</HintPath>
+      <HintPath>..\..\binding\ATMHud.dll</HintPath>
     </Reference>
-    <Reference Include="MonoTouch.Dialog-1" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />

diff --git a/ATMHud/sample/sample.sln → ATMHud/samples/ATMHudSample/sample.sln b/ATMHud/sample/sample.sln → ATMHud/samples/ATMHudSample/sample.sln
diff --git a/ATMHud/samples/Makefile b/ATMHud/samples/Makefile
@@ -0,0 +1,10 @@
+#### Sample Builder
+#### Author: Alex Soto alex.soto@xamarin.com
+
+MDTOOL=/Applications/Xamarin\ Studio.app/Contents/MacOS/mdtool
+
+all:
+	$(MDTOOL) build -c:"Release|iPhone" ATMHudSample/sample.sln
+
+clean:
+	$(MDTOOL) build -c:"Release|iPhone" -t:Clean ATMHudSample/sample.sln
diff --git a/AmazonLogin/samples/Makefile b/AmazonLogin/samples/Makefile
@@ -0,0 +1,10 @@
+#### Sample Builder
+#### Author: Alex Soto alex.soto@xamarin.com
+
+MDTOOL=/Applications/Xamarin\ Studio.app/Contents/MacOS/mdtool
+
+all:
+	$(MDTOOL) build -c:"Release|iPhone" AmazonLoginSample/AmazonLoginSample.sln
+
+clean:
+	$(MDTOOL) build -c:"Release|iPhone" -t:Clean AmazonLoginSample/AmazonLoginSample.sln
diff --git a/BPStatusBar/samples/Makefile b/BPStatusBar/samples/Makefile
@@ -0,0 +1,10 @@
+#### Sample Builder
+#### Author: Alex Soto alex.soto@xamarin.com
+
+MDTOOL=/Applications/Xamarin\ Studio.app/Contents/MacOS/mdtool
+
+all:
+	$(MDTOOL) build -c:"Release|iPhone" BPStatusBarSample.sln
+
+clean:
+	$(MDTOOL) build -c:"Release|iPhone" -t:Clean BPStatusBarSample.sln
diff --git a/BeeblexSDK/binding/Makefile b/BeeblexSDK/binding/Makefile
@@ -30,9 +30,5 @@ BeeblexSDK.dll: ApiDefinition.cs Extensions.cs AssemblyInfo.cs lib$(TARGET).a
 	$(SMCS) -noconfig -o- -out:$@ -res:libBeeblex-SDK.a AssemblyInfo.cs Extensions.cs @ios/sources.list -target:library -unsafe -reference:/Developer/MonoTouch/usr/lib/mono/2.1/System.dll -reference:/Developer/MonoTouch/usr/lib/mono/2.1/monotouch.dll -reference:/Developer/MonoTouch/usr/lib/mono/2.1/System.Core.dll
 
 clean: 
-	-rm -f *.a *.dll
-
-clean-all: clean
-	-rm -rf $(PROJECT_ROOT) $(PROJECT_TGZ) ios
-
-.PHONY: clean clean-all
+	-rm -rf *.a *.dll $(PROJECT_ROOT) $(PROJECT_TGZ) ios/
+.PHONY: clean
diff --git a/BeeblexSDK/samples/Makefile b/BeeblexSDK/samples/Makefile
@@ -0,0 +1,10 @@
+#### Sample Builder
+#### Author: Alex Soto alex.soto@xamarin.com
+
+MDTOOL=/Applications/Xamarin\ Studio.app/Contents/MacOS/mdtool
+
+all:
+	$(MDTOOL) build -c:"Release|iPhone" BeeblexDemo.sln
+
+clean:
+	$(MDTOOL) build -c:"Release|iPhone" -t:Clean BeeblexDemo.sln
diff --git a/CorePlot/README.md b/CorePlot/README.md
@@ -6,7 +6,7 @@ available from:
 
 	  http://code.google.com/p/core-plot/
 
-This binding is for version 0.9 released on September 25, 2011
+This binding is for version 1.4 released on September 28, 2013
 
 MIT X11 licensed
 
@@ -17,11 +17,11 @@ Building
 To build the bindings, run the `make` command from within the bindings
 directory.
 
-To build the sample project, open CorePlotSample.sln in MonoDevelop and run it.
+To build the sample project, open CorePlotSample.sln in Xamarin Studio and run it.
 
 
-Using CorePlot.dll with your own iOS App
+Using CorePlotiOS.dll with your own iOS App
 ======================================
 
-Simply add CorePlot.dll to your project's References in MonoDevelop and you are
+Simply add CorePlotiOS.dll to your project's References in Xamarin Studio and you are
 good to go!
diff --git a/CorePlot/binding/AssemblyInfo.cs b/CorePlot/binding/AssemblyInfo.cs
@@ -1,4 +1,4 @@
 using System;
 using MonoTouch.ObjCRuntime;
 
-[assembly: LinkWith ("libCorePlot-CocoaTouch.a", LinkTarget.Simulator | LinkTarget.ArmV6 | LinkTarget.ArmV7, Frameworks = "CoreGraphics QuartzCore", ForceLoad = true, IsCxx = true)]
+[assembly: LinkWith ("libCorePlot-CocoaTouch.a", LinkTarget.ArmV7 | LinkTarget.ArmV7s | LinkTarget.Simulator, Frameworks = "CoreGraphics QuartzCore", ForceLoad = true)]
diff --git a/CorePlot/binding/CorePlotiOS.dll b/CorePlot/binding/CorePlotiOS.dll
diff --git a/CorePlot/binding/Makefile b/CorePlot/binding/Makefile
@@ -7,7 +7,7 @@ MONOMAC_DLL=$(MONOMAC)/src/MonoMac.dll
 BMAC=mono --debug $(MONOMAC)/src/bmac.exe
 XAM_BMAC=/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/usr/bin/bmac
 XAMMAC_DLL=/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/usr/lib/mono/XamMac.dll
-VERSION=0.9
+VERSION=1.4
 
 PROJECT_ROOT=CorePlot_$(VERSION)/Source/framework
 PROJECT=$(PROJECT_ROOT)/CorePlot-CocoaTouch.xcodeproj