Build QuartzCore

QuartzCore/CALayerContext.m

@@ -2,6 +2,9 @@
 #import <QuartzCore/CALayer.h>
 #import <QuartzCore/CARenderer.h>
 #import <Foundation/NSString.h>
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
 
 @interface CALayer(private)
 -(void)_setContext:(CALayerContext *)context;
@@ -32,7 +35,8 @@
    GLint backingOrigin[2]={rect.origin.x,rect.origin.y};
    GLint backingSize[2]={width,height};
 
-   CGLSetParameter(_glContext,kCGLCPSurfaceBackingOrigin,backingOrigin);
+#warning disabled because it isn't standard
+   //CGLSetParameter(_glContext,kCGLCPSurfaceBackingOrigin,backingOrigin);
    CGLSetParameter(_glContext,kCGLCPSurfaceBackingSize,backingSize);
    
    GLint opacity=0;
@@ -58,7 +62,8 @@
    GLint backingOrigin[2]={rect.origin.x,rect.origin.y};
    GLint backingSize[2]={width,height};
 
-   CGLSetParameter(_glContext,kCGLCPSurfaceBackingOrigin,backingOrigin);
+#warning disabled because it isn't standard
+//   CGLSetParameter(_glContext,kCGLCPSurfaceBackingOrigin,backingOrigin);
    CGLSetParameter(_glContext,kCGLCPSurfaceBackingSize,backingSize);
 }
 

QuartzCore/CARenderer.m

@@ -3,9 +3,12 @@
 #import <QuartzCore/CAAnimation.h>
 #import <QuartzCore/CAMediaTimingFunction.h>
 #import <CoreVideo/CoreVideo.h>
-#import <OpenGL/OpenGL.h>
 #import <Onyx2D/O2Surface.h>
 
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+
 @interface CALayer(private)
 -(void)_setContext:(CALayerContext *)context;
 -(void)_setTextureId:(NSNumber *)value;

QuartzCore/CATransaction.m

@@ -1,8 +1,6 @@
 #import <QuartzCore/CATransaction.h>
 #import <QuartzCore/CALayerContext.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSNumber.h>
-#import <Foundation/NSArray.h>
+#import <Foundation/Foundation.h>
 #import "CATransactionGroup.h"
 
 NSString * const kCATransactionAnimationDuration=@"kCATransactionAnimationDuration";

QuartzCore/CAWindowOpenGLContext.m

@@ -1,5 +1,7 @@
 #import <QuartzCore/CAWindowOpenGLContext.h>
-#import <OpenGL/OpenGL.h>
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
 #import <Onyx2D/O2Surface.h>
 
 @implementation CAWindowOpenGLContext

QuartzCore/CMakeLists.txt

@@ -1,39 +1,14 @@
 project(QuartzCore)
 
-include(darling_framework)
+set(DYLIB_COMPAT_VERSION "1.2.0")
+set(DYLIB_CURRENT_VERSION "1.11.0")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
-	-include math.h \
-	-include stdlib.h \
-	-include CoreFoundation/CoreFoundation.h \
-	-include Foundation/Foundation.h \
-	-Wno-nonportable-include-path \
-	-Wno-deprecated-objc-isa-usage \
-	-mmacosx-version-min=10.10"
-)
+add_framework(QuartzCore
+    FAT
+    CURRENT_VERSION
+    VERSION "A"
 
-include_directories(
-	${CMAKE_SOURCE_DIR}/src/external/foundation/include
-	${CMAKE_SOURCE_DIR}/src/external/foundation/include/Foundation
-	${CMAKE_SOURCE_DIR}/src/external/corefoundation
-	${CMAKE_SOURCE_DIR}/src/external/objc4/runtime
-	${CMAKE_SOURCE_DIR}/src/external/libclosure
-	${CMAKE_SOURCE_DIR}/src/external/security/include
-	${CMAKE_SOURCE_DIR}/src/external/cfnetwork/include
-	${CMAKE_SOURCE_DIR}/src/external/cfnetwork/private_include
-	${CMAKE_SOURCE_DIR}/src/launchd/liblaunch
-	${CMAKE_SOURCE_DIR}/src/libmalloc/include
-	${CMAKE_SOURCE_DIR}/src/copyfile
-	${CMAKE_SOURCE_DIR}/src/libc/gen
-	${CMAKE_SOURCE_DIR}/src/external/icu/icuSources/i18n
-	${CMAKE_SOURCE_DIR}/src/external/icu/icuSources/common
-	${CMAKE_SOURCE_DIR}/src/external/libxml2/include
-	${CMAKE_BINARY_DIR}/src/external/libxml2/include
-
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-set(QuartzCore_sources
+    SOURCES
 	CAAnimationGroup.m
 	CAAnimation.m
 	CABase.m
@@ -52,31 +27,30 @@ set(QuartzCore_sources
 	CIAffineTransform.m
 	CIBloom.m
 	CIBoxBlur.m
+	CAAnimationGroup.m
 	CIColor.m
 	CIContext.m
 	CIFilter.m
 	CIImage.m
 	CILinearGradient.m
 	CIVector.m
-)
 
-set_source_files_properties(${QuartzCore_sources} LANGUAGE C)
-
-add_framework(QuartzCore
-	FAT
-	CURRENT_VERSION
-	SOURCES
-		${QuartzCore_sources}
-	VERSION "A"
     DEPENDENCIES
+	CoreImage
+	CoreVideo
 	objc
+	Accelerate
+	CoreGraphics
+	CoreText
+	ImageIO
+	IOSurface
+	Metal
+	OpenGL
+	Security
+	xml2
+	cxx
 	system
 	CoreFoundation
 	Foundation
 	Onyx2D
-		# native libraries
-		GL
-	CIRCULAR_DEPENDENCIES
-		OpenGL
-		CoreGraphics
 )