From 19b47b890d02910a6823cf716f658e97494e3614 Mon Sep 17 00:00:00 2001 From: Thomas A Date: Sun, 4 Sep 2022 10:58:40 -0700 Subject: [PATCH] Generate Headers for AppKit, Cocoa, CoreData, CoreGraphics, CoreText, Onyx2D, and QuartzCore --- AppKit/CMakeLists.txt | 11 ++++++++++- Cocoa/CMakeLists.txt | 11 ++++++++++- Cocoa/{ => include/Cocoa}/Cocoa.h | 0 CoreData/CMakeLists.txt | 11 ++++++++++- CoreGraphics/CMakeLists.txt | 11 ++++++++++- CoreText/CMakeLists.txt | 11 ++++++++++- Onyx2D/CMakeLists.txt | 12 +++++++++++- QuartzCore/CMakeLists.txt | 11 ++++++++++- 8 files changed, 71 insertions(+), 7 deletions(-) rename Cocoa/{ => include/Cocoa}/Cocoa.h (100%) diff --git a/AppKit/CMakeLists.txt b/AppKit/CMakeLists.txt index a6ebbb95..21381548 100644 --- a/AppKit/CMakeLists.txt +++ b/AppKit/CMakeLists.txt @@ -2,6 +2,8 @@ project(AppKit) include(darling_framework) +remove_sdk_framework(AppKit) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \ -include math.h \ -include stdlib.h \ @@ -444,6 +446,8 @@ set_source_files_properties(${AppKit_sources} LANGUAGE C) set(DYLIB_COMPAT_VERSION "45.0.0") set(DYLIB_CURRENT_VERSION "1499.11.0") +set(FRAMEWORK_VERSION "C") + set(AppKit_resources Info.plist Info.plist @@ -504,6 +508,11 @@ set(AppKit_resources en.lproj/NSOpenPanel.nib en.lproj/NSOpenPanel.nib ) +generate_sdk_framework(AppKit + VERSION ${FRAMEWORK_VERSION} + HEADER "include/AppKit" +) + add_framework(AppKit FAT CURRENT_VERSION @@ -511,7 +520,7 @@ add_framework(AppKit ${AppKit_sources} RESOURCES ${AppKit_resources} - VERSION "C" + VERSION ${FRAMEWORK_VERSION} DEPENDENCIES objc system diff --git a/Cocoa/CMakeLists.txt b/Cocoa/CMakeLists.txt index 41ca3fb7..becb065e 100644 --- a/Cocoa/CMakeLists.txt +++ b/Cocoa/CMakeLists.txt @@ -1,5 +1,7 @@ project(Cocoa) +remove_sdk_framework(Cocoa) + set(Cocoa_sources Cocoa.m ) @@ -9,12 +11,19 @@ set_source_files_properties(${Cocoa_sources} LANGUAGE C) set(DYLIB_COMPAT_VERSION "1.0.0") set(DYLIB_CURRENT_VERSION "22.0.0") +set(FRAMEWORK_VERSION "A") + +generate_sdk_framework(Cocoa + VERSION ${FRAMEWORK_VERSION} + HEADER "include/Cocoa" +) + add_framework(Cocoa FAT CURRENT_VERSION SOURCES ${Cocoa_sources} - VERSION "A" + VERSION ${FRAMEWORK_VERSION} DEPENDENCIES objc system diff --git a/Cocoa/Cocoa.h b/Cocoa/include/Cocoa/Cocoa.h similarity index 100% rename from Cocoa/Cocoa.h rename to Cocoa/include/Cocoa/Cocoa.h diff --git a/CoreData/CMakeLists.txt b/CoreData/CMakeLists.txt index a4fd7be4..21d80f25 100644 --- a/CoreData/CMakeLists.txt +++ b/CoreData/CMakeLists.txt @@ -2,6 +2,8 @@ project(CoreData) include(darling_framework) +remove_sdk_framework(CoreData) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \ -include math.h \ -include stdlib.h \ @@ -50,12 +52,19 @@ set_source_files_properties(${CoreData_sources} LANGUAGE C) set(DYLIB_COMPAT_VERSION "1.0.0") set(DYLIB_CURRENT_VERSION "752.0.0") +set(FRAMEWORK_VERSION "A") + +generate_sdk_framework(CoreData + VERSION ${FRAMEWORK_VERSION} + HEADER "include/CoreData" +) + add_framework(CoreData FAT CURRENT_VERSION SOURCES ${CoreData_sources} - VERSION "A" + VERSION ${FRAMEWORK_VERSION} DEPENDENCIES objc system diff --git a/CoreGraphics/CMakeLists.txt b/CoreGraphics/CMakeLists.txt index 756cc726..895e82aa 100644 --- a/CoreGraphics/CMakeLists.txt +++ b/CoreGraphics/CMakeLists.txt @@ -2,6 +2,8 @@ project(CoreGraphics) include(darling_framework) +remove_sdk_framework(CoreGraphics) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \ -include math.h \ -include stdlib.h \ @@ -106,12 +108,19 @@ set_source_files_properties(${CoreGraphics_sources} LANGUAGE C) set(DYLIB_COMPAT_VERSION "64.0.0") set(DYLIB_CURRENT_VERSION "1070.22.0") +set(FRAMEWORK_VERSION "A") + +generate_sdk_framework(CoreGraphics + VERSION ${FRAMEWORK_VERSION} + HEADER "include/CoreGraphics" +) + add_framework(CoreGraphics FAT CURRENT_VERSION SOURCES ${CoreGraphics_sources} - VERSION "A" + VERSION ${FRAMEWORK_VERSION} DEPENDENCIES objc system diff --git a/CoreText/CMakeLists.txt b/CoreText/CMakeLists.txt index b8d311d9..358483cf 100644 --- a/CoreText/CMakeLists.txt +++ b/CoreText/CMakeLists.txt @@ -1,5 +1,7 @@ project(CoreText) +remove_sdk_framework(CoreText) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \ -Wno-deprecated-objc-isa-usage \ -mmacosx-version-min=10.10" @@ -25,12 +27,19 @@ set_source_files_properties(${CoreText_sources} LANGUAGE C) set(DYLIB_COMPAT_VERSION "1.0.0") set(DYLIB_CURRENT_VERSION "1.0.0") +set(FRAMEWORK_VERSION "A") + +generate_sdk_framework(CoreText + VERSION ${FRAMEWORK_VERSION} + HEADER "include/CoreText" +) + add_framework(CoreText FAT CURRENT_VERSION SOURCES ${CoreText_sources} - VERSION "A" + VERSION ${FRAMEWORK_VERSION} DEPENDENCIES objc system diff --git a/Onyx2D/CMakeLists.txt b/Onyx2D/CMakeLists.txt index 2db1420b..f4b389e1 100644 --- a/Onyx2D/CMakeLists.txt +++ b/Onyx2D/CMakeLists.txt @@ -2,6 +2,8 @@ project(Onyx2D) include(darling_framework) +remove_sdk_framework(Onyx2D) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \ -include math.h \ -include stdlib.h \ @@ -134,13 +136,21 @@ set(Onyx2D_sources set_source_files_properties(${Onyx2D_sources} LANGUAGE C) + +set(FRAMEWORK_VERSION "A") + +generate_sdk_framework(Onyx2D + VERSION ${FRAMEWORK_VERSION} + HEADER "include/Onyx2D" +) + add_framework(Onyx2D FAT CURRENT_VERSION PRIVATE SOURCES ${Onyx2D_sources} - VERSION "A" + VERSION ${FRAMEWORK_VERSION} DEPENDENCIES objc system diff --git a/QuartzCore/CMakeLists.txt b/QuartzCore/CMakeLists.txt index f3725f26..0cb38f58 100644 --- a/QuartzCore/CMakeLists.txt +++ b/QuartzCore/CMakeLists.txt @@ -2,6 +2,8 @@ project(QuartzCore) include(darling_framework) +remove_sdk_framework(QuartzCore) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \ -include math.h \ -include stdlib.h \ @@ -65,12 +67,19 @@ set_source_files_properties(${QuartzCore_sources} LANGUAGE C) set(DYLIB_COMPAT_VERSION "1.2.0") set(DYLIB_CURRENT_VERSION "1.11.0") +set(FRAMEWORK_VERSION "A") + +generate_sdk_framework(QuartzCore + VERSION ${FRAMEWORK_VERSION} + HEADER "include/QuartzCore" +) + add_framework(QuartzCore FAT CURRENT_VERSION SOURCES ${QuartzCore_sources} - VERSION "A" + VERSION ${FRAMEWORK_VERSION} DEPENDENCIES objc system