Build OpenGL

AppKit/CMakeLists.txt

@@ -295,7 +295,7 @@ set(AppKit_sources
 	X11.subproj/X11Window.m
 	X11.subproj/KTFont_FT.m
 	X11.subproj/O2Font_FT.m
-	X11.subproj/CGLContext.m
+	# CGLContext.m is built in OpenGL
 	# X11.subproj/NSOpenGLDrawable_X11.m conflicting types for CGLCreateContext
 	X11.subproj/O2Context_cairo.m
 	X11.subproj/X11Display.m
@@ -386,7 +386,6 @@ add_framework(AppKit
 		CoreGraphics
 		Onyx2D
 		CoreText
-		QuartzCore
 		# native libraries
 		FreeType
 		fontconfig
@@ -394,4 +393,7 @@ add_framework(AppKit
 		GL
 		cairo
 		jpeg png tiff
+	CIRCULAR_DEPENDENCIES
+		OpenGL
+		QuartzCore
 )

OpenGL/CMakeLists.txt

@@ -0,0 +1,61 @@
+project(OpenGL)
+
+include(darling_framework)
+
+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"
+)
+
+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(OpenGL_sources
+	OpenGL.m
+
+	# weird, I know
+	../AppKit/X11.subproj/CGLContext.m
+)
+
+set_source_files_properties(${OpenGL_sources} LANGUAGE C)
+
+add_framework(OpenGL
+	FAT
+	CURRENT_VERSION
+	SOURCES
+		${OpenGL_sources}
+	VERSION "A"
+	DEPENDENCIES
+		objc
+		system
+		CoreFoundation
+		Foundation
+		# native libraries
+		GL
+		X11
+	CIRCULAR_DEPENDENCIES
+		AppKit
+)

QuartzCore/CMakeLists.txt

@@ -77,4 +77,6 @@ add_framework(QuartzCore
 		Onyx2D
 		# native libraries
 		GL
+	CIRCULAR_DEPENDENCIES
+		OpenGL
 )