Skip to content
Browse files

2010-07-09 Miguel de Icaza <miguel@novell.com>

	* Sync to the latest version.

svn path=/trunk/monomac/; revision=160132
  • Loading branch information...
1 parent 4d040ee commit 02cfbd65944420cd5740242e27894cb8a7fc856b @migueldeicaza migueldeicaza committed Jul 9, 2010
Showing with 15 additions and 45 deletions.
  1. +4 −0 ChangeLog
  2. +2 −2 samples/Hello/Hello.app/Contents/MacOS/Hello
  3. +1 −0 src/Constants.cs
  4. +8 −0 src/Makefile
  5. +0 −43 src/ObjCRuntime/Runtime.cs
View
4 ChangeLog
@@ -0,0 +1,4 @@
+2010-07-09 Miguel de Icaza <miguel@novell.com>
+
+ * Sync to the latest version.
+
View
4 samples/Hello/Hello.app/Contents/MacOS/Hello
@@ -21,6 +21,6 @@ MONO_BIN=`which mono`
MONO_OPTIONS="--debug"
EXEC_PATH="$APP_ROOT"/"$APP_NAME"
if [ -f "$EXEC_PATH" ]; then rm -f "$EXEC_PATH" ; fi
-ln -s $MONO_BIN "$EXEC_PATH"
echo $EXEC_PATH >> /tmp/logme
-exec -a $APP_NAME "$EXEC_PATH" $MONO_OPTIONS "$RESOURCES_PATH"/"$ASSEMBLY"
+EXEC_PATH=/usr/bin/mono
+exec "$EXEC_PATH" $MONO_OPTIONS "$RESOURCES_PATH"/"$ASSEMBLY"
View
1 src/Constants.cs
@@ -29,5 +29,6 @@ public static partial class Constants {
public const string FoundationLibrary = "/System/Library/Frameworks/Foundation.framework/Foundation";
public const string ObjectiveCLibrary = "/usr/lib/libobjc.dylib";
public const string SystemLibrary = "/usr/lib/libSystem.dylib";
+ public const string QuartzLibrary = "/System/Library/Frameworks/QuartzCore.framework/QuartzCore";
}
}
View
8 src/Makefile
@@ -43,6 +43,7 @@ DEFINES = -define:NET_2_0
TARGETS = bmac.exe monomac.dll parse.exe
SHARED_SOURCE = \
+ ./CoreAnimation/CATransform3D.cs \
./CoreFoundation/CFArray.cs \
./CoreFoundation/CFBoolean.cs \
./CoreFoundation/CFDictionary.cs \
@@ -61,6 +62,7 @@ SHARED_SOURCE = \
./CoreGraphics/CGGeometry.cs \
./CoreGraphics/CGGradient.cs \
./CoreGraphics/CGImage.cs \
+ ./CoreGraphics/CGLayer.cs \
./CoreGraphics/CGPDFDocument.cs \
./CoreGraphics/CGPDFPage-2.cs \
./CoreGraphics/CGPDFPage.cs \
@@ -107,6 +109,7 @@ SHARED_SOURCE = \
./Foundation/RegisterAttribute.cs \
./ObjCRuntime/ArgumentSemantic.cs \
./ObjCRuntime/AlphaAttribute.cs \
+ ./ObjCRuntime/Blocks.cs \
./ObjCRuntime/INativeObject.cs \
./ObjCRuntime/Dlfcn.cs \
./ObjCRuntime/SinceAttribute.cs \
@@ -117,6 +120,7 @@ SHARED_SOURCE = \
# ./CoreGraphics/CGShading.cs \
SHARED_CORE_SOURCE = \
+ ./CoreAnimation/CATransform3D.cs \
./CoreFoundation/CFString.cs \
./CoreFoundation/CFUrl.cs \
./CoreFoundation/CFRunLoop.cs \
@@ -131,11 +135,14 @@ SHARED_CORE_SOURCE = \
./CoreGraphics/CGGeometry.cs \
./CoreGraphics/CGGradient.cs \
./CoreGraphics/CGImage.cs \
+ ./CoreGraphics/CGLayer.cs \
./CoreGraphics/CGPDFDocument.cs \
./CoreGraphics/CGPDFPage-2.cs \
./CoreGraphics/CGPDFPage.cs \
./CoreGraphics/CGPath.cs \
./CoreGraphics/CGPattern.cs \
+ ./CoreMedia/CMSampleBuffer.cs \
+ ./CoreMedia/CoreMedia.cs \
./Foundation/ConnectAttribute.cs \
./Foundation/Enum.cs \
./Foundation/ExportAttribute.cs \
@@ -147,6 +154,7 @@ SHARED_CORE_SOURCE = \
./Foundation/PreserveAttribute.cs \
./ObjCRuntime/ArgumentSemantic.cs \
./ObjCRuntime/AlphaAttribute.cs \
+ ./ObjCRuntime/Blocks.cs \
./ObjCRuntime/INativeObject.cs \
./ObjCRuntime/SinceAttribute.cs \
./ObjCRuntime/TypeConverter.cs \
View
43 src/ObjCRuntime/Runtime.cs
@@ -96,47 +96,4 @@ public static class Runtime {
}
}
}
-
- [StructLayout (LayoutKind.Sequential)]
- public struct BlockDescriptor {
- public int reserved;
- public int size;
- public IntPtr copy_helper;
- public IntPtr dispose;
- }
-
- [StructLayout (LayoutKind.Sequential)]
- public struct BlockLiteral {
- public IntPtr isa;
- public int flags;
- public int reserved;
- public IntPtr invoke;
- public IntPtr block_descriptor;
- public IntPtr handle;
-
- internal static IntPtr MonoTouchDescriptor;
-
- //
- // trampoline must be static, and someone else needs to keep a ref to it
- //
- public static unsafe IntPtr CreateBlock (Delegate trampoline, Delegate userDelegate)
- {
- if (MonoTouchDescriptor == IntPtr.Zero){
- var desc = Marshal.AllocHGlobal (sizeof (BlockDescriptor));
- Marshal.WriteInt32 (desc, 4, sizeof (BlockLiteral));
- MonoTouchDescriptor = desc;
- }
-
- var block = (BlockLiteral *) Marshal.AllocHGlobal (sizeof (BlockLiteral));
- block->block_descriptor = MonoTouchDescriptor;
- block->isa = Class.GetHandle ("__NSConcreteGlobalBlock");
- block->invoke = Marshal.GetFunctionPointerForDelegate (trampoline);
-
- // BLOCK_IS_GLOBAL, maybe add later BLOCK_HAS_COPY_DISPOSE (1 << 25)
- block->flags = 1 << 28;
- block->handle = (IntPtr) GCHandle.Alloc (userDelegate);
-
- return (IntPtr) block;
- }
- }
}

0 comments on commit 02cfbd6

Please sign in to comment.
Something went wrong with that request. Please try again.