summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2008-11-23 15:25:44 +0000
committerJay Freeman <saurik@saurik.com>2008-11-23 15:25:44 +0000
commit26d99a24e580e4a7aee299ff838554d44e029a6e (patch)
tree5bf358e99912e77bafa5cb1ae25dddbddc7e0871
parent2752995ab16f484766da4ba82371944d29b3bb37 (diff)
Fixed CoreAnimation.h with OpenGL.
git-svn-id: http://svn.telesphoreo.org/trunk@515 514c082c-b64e-11dc-b46d-3d985efe055d
-rw-r--r--tool/include.diff14
-rw-r--r--tool/patches/CoreAnimation.diff14
2 files changed, 28 insertions, 0 deletions
diff --git a/tool/include.diff b/tool/include.diff
index 7e1f95361..854e39175 100644
--- a/tool/include.diff
+++ b/tool/include.diff
@@ -111,6 +111,20 @@ index 64e4e8b..0f43f4c 100644
#define __DARWIN_ONLY_UNIX_CONFORMANCE 1
#define __DARWIN_ONLY_VERS_1050 1
+diff --git a/QuartzCore/CoreAnimation.h b/QuartzCore/CoreAnimation.h
+index 6f45332..6a0cf35 100644
+--- a/QuartzCore/CoreAnimation.h
++++ b/QuartzCore/CoreAnimation.h
+@@ -16,7 +16,9 @@
+ #import <QuartzCore/CALayer.h>
+ #import <QuartzCore/CAMediaTiming.h>
+ #import <QuartzCore/CAMediaTimingFunction.h>
++#ifndef __arm__
+ #import <QuartzCore/CAOpenGLLayer.h>
++#endif
+ #import <QuartzCore/CARenderer.h>
+ #import <QuartzCore/CAScrollLayer.h>
+ #import <QuartzCore/CATextLayer.h>
--- /usr/include/CoreFoundation/CoreFoundation.h 2008-02-27 06:36:09.000000000 +0000
+++ /usr/include/CoreFoundation/CoreFoundation.h 2008-03-29 18:47:27.000000000 +0000
@@ -78,7 +78,7 @@
diff --git a/tool/patches/CoreAnimation.diff b/tool/patches/CoreAnimation.diff
new file mode 100644
index 000000000..1d664a016
--- /dev/null
+++ b/tool/patches/CoreAnimation.diff
@@ -0,0 +1,14 @@
+diff --git a/QuartzCore/CoreAnimation.h b/QuartzCore/CoreAnimation.h
+index 6f45332..6a0cf35 100644
+--- a/QuartzCore/CoreAnimation.h
++++ b/QuartzCore/CoreAnimation.h
+@@ -16,7 +16,9 @@
+ #import <QuartzCore/CALayer.h>
+ #import <QuartzCore/CAMediaTiming.h>
+ #import <QuartzCore/CAMediaTimingFunction.h>
++#ifndef __arm__
+ #import <QuartzCore/CAOpenGLLayer.h>
++#endif
+ #import <QuartzCore/CARenderer.h>
+ #import <QuartzCore/CAScrollLayer.h>
+ #import <QuartzCore/CATextLayer.h>