From 07fce117807037530d43fa2408e389643189dc12 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Fri, 8 Dec 2017 14:16:32 +0300 Subject: [PATCH] Use Xcode-bundled SDKs for macOS, iOS and iOS simulator targets Also * Update macOS SDK to 10.13 * Update iOS SDK to 11.2 * Enable iOS simulator support * Disable tetris on iOS as we don't provide SDL2 in sysroot anymore --- .../native/interop/gen/jvm/ClangDefaults.kt | 2 +- README.md | 3 +- RELEASE_NOTES.md | 2 + .../kotlin/backend/konan/LinkStage.kt | 3 +- backend.native/konan.properties | 58 ++++++++++++++----- klib/src/platform/ios/AVFoundation.def | 2 +- klib/src/platform/ios/AVKit.def | 2 +- klib/src/platform/ios/Accelerate.def | 2 +- klib/src/platform/ios/AddressBookUI.def | 2 +- klib/src/platform/ios/ContactsUI.def | 2 +- klib/src/platform/ios/CoreAudioKit.def | 2 +- klib/src/platform/ios/CoreImage.def | 2 +- klib/src/platform/ios/CoreMedia.def | 2 +- klib/src/platform/ios/CoreVideo.def | 2 +- klib/src/platform/ios/EventKitUI.def | 2 +- klib/src/platform/ios/FileProvider.def | 9 +++ klib/src/platform/ios/GLKit.def | 2 +- klib/src/platform/ios/GameController.def | 2 +- klib/src/platform/ios/GameKit.def | 2 +- klib/src/platform/ios/GameplayKit.def | 2 +- klib/src/platform/ios/HealthKitUI.def | 2 +- klib/src/platform/ios/HomeKit.def | 2 +- klib/src/platform/ios/IOSurface.def | 9 +++ klib/src/platform/ios/Intents.def | 2 +- klib/src/platform/ios/IntentsUI.def | 2 +- klib/src/platform/ios/MapKit.def | 2 +- klib/src/platform/ios/MediaPlayer.def | 2 +- klib/src/platform/ios/MediaToolbox.def | 2 +- klib/src/platform/ios/MessageUI.def | 2 +- klib/src/platform/ios/Messages.def | 2 +- klib/src/platform/ios/Metal.def | 2 +- klib/src/platform/ios/MetalKit.def | 2 +- .../platform/ios/MultipeerConnectivity.def | 2 +- klib/src/platform/ios/NotificationCenter.def | 2 +- klib/src/platform/ios/PassKit.def | 2 +- klib/src/platform/ios/Photos.def | 2 +- klib/src/platform/ios/PhotosUI.def | 2 +- klib/src/platform/ios/QuickLook.def | 2 +- klib/src/platform/ios/ReplayKit.def | 2 +- klib/src/platform/ios/SafariServices.def | 2 +- klib/src/platform/ios/SceneKit.def | 2 +- klib/src/platform/ios/Security.def | 2 +- klib/src/platform/ios/Social.def | 2 +- klib/src/platform/ios/Speech.def | 2 +- klib/src/platform/ios/SpriteKit.def | 2 +- klib/src/platform/ios/StoreKit.def | 2 +- klib/src/platform/ios/Twitter.def | 2 +- klib/src/platform/ios/UIKit.def | 4 +- klib/src/platform/ios/UserNotificationsUI.def | 2 +- klib/src/platform/ios/VideoToolbox.def | 2 +- klib/src/platform/ios/WatchKit.def | 2 +- klib/src/platform/ios/WebKit.def | 2 +- klib/src/platform/ios/darwin.def | 1 + klib/src/platform/ios/iAd.def | 2 +- klib/src/platform/osx/IOSurface.def | 4 +- klib/src/platform/osx/Security.def | 2 +- klib/src/platform/osx/posix.def | 4 +- samples/objc/src/main/kotlin/Window.kt | 2 +- samples/tetris/build.gradle | 13 +---- samples/tetris/build.sh | 6 -- .../kotlin/konan/target/ClangArgs.kt | 2 +- .../kotlin/konan/target/KonanTarget.kt | 2 +- 62 files changed, 123 insertions(+), 93 deletions(-) create mode 100644 klib/src/platform/ios/FileProvider.def create mode 100644 klib/src/platform/ios/IOSurface.def diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ClangDefaults.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ClangDefaults.kt index 030849125f2..2e53ad64ce3 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ClangDefaults.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ClangDefaults.kt @@ -48,7 +48,7 @@ fun KonanProperties.defaultCompilerOpts(): List { MACBOOK -> { val osVersionMinFlag = targetString("osVersionMinFlagClang") val osVersionMinValue = targetString("osVersionMin") - listOf("-B$targetToolchain/bin") + + listOf("-B$targetToolchain/usr/bin") + (if (osVersionMinFlag != null && osVersionMinValue != null) listOf("$osVersionMinFlag=$osVersionMinValue") else emptyList()) } diff --git a/README.md b/README.md index ac53020b515..7b594cfd938 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,8 @@ or where a developer is willing to produce a reasonably-sized self-contained pro without the need to ship an additional execution runtime. Prerequisites: - install JDK for your platform, instead of JRE. The build requires ```tools.jar```, which is not included in JRE. +* install JDK for your platform, instead of JRE. The build requires ```tools.jar```, which is not included in JRE; +* on macOS install Xcode 9.2 To compile from sources use following steps: diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 8cfe6f9d50d..72ed730767a 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -39,6 +39,8 @@ the following platforms: To run _Kotlin/Native_ JDK8 for the host platform has to be installed. Note that Java 9 not yet supported. +On macOS it also requires Xcode 9.2 or newer. + The language and library version supported by this EAP release mostly match Kotlin 1.2. However, there are certain limitations, see section [Known Limitations](#limitations). diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/LinkStage.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/LinkStage.kt index b2edbc2e9ca..a61cf403c9b 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/LinkStage.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/LinkStage.kt @@ -121,8 +121,7 @@ internal open class AndroidPlatform(distribution: Distribution) internal open class MacOSBasedPlatform(distribution: Distribution) : PlatformFlags(distribution.targetProperties) { - // TODO: move 'ld' out of the host sysroot, as it doesn't belong here. - private val linker = "${distribution.hostSysRoot}/usr/bin/ld" + private val linker = "$targetToolchain/usr/bin/ld" internal val dsymutil = "${distribution.llvmBin}/llvm-dsymutil" internal val libLTO = distribution.libLTO diff --git a/backend.native/konan.properties b/backend.native/konan.properties index 15d9029b30e..cdf96520943 100644 --- a/backend.native/konan.properties +++ b/backend.native/konan.properties @@ -33,10 +33,10 @@ llvmVersion = 5.0.0 # Mac OS X. llvmHome.osx = clang-llvm-5.0.0-darwin-macos -targetToolchain.osx = clang-llvm-5.0.0-darwin-macos +targetToolchain.osx = target-toolchain-1-osx arch.osx = x86_64 -targetSysRoot.osx = target-sysroot-1-darwin-macos +targetSysRoot.osx = target-sysroot-2-darwin-macos libffiDir.osx = libffi-3.2.1-2-darwin-macos llvmLtoFlags.osx = llvmLtoOptFlags.osx = -O3 -function-sections @@ -50,20 +50,39 @@ osVersionMinFlagLd.osx = -macosx_version_min osVersionMinFlagClang.osx = -mmacosx-version-min osVersionMin.osx = 10.11 entrySelector.osx = -alias _Konan_main _main -dependencies.osx = target-sysroot-1-darwin-macos \ +dependencies.osx = target-sysroot-2-darwin-macos \ libffi-3.2.1-2-darwin-macos \ - clang-llvm-5.0.0-darwin-macos + clang-llvm-5.0.0-darwin-macos \ + target-toolchain-1-osx + +target-sysroot-2-darwin-macos.default = \ + remote:internal \ + /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk + +target-sysroot-2-darwin-macos.alt = \ + /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk + +target-toolchain-1-osx.default = \ + remote:internal \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain # Apple iOS. -targetToolchain.osx-ios = clang-llvm-5.0.0-darwin-macos -dependencies.osx-ios = target-sysroot-1-darwin-macos \ +targetToolchain.osx-ios = target-toolchain-1-osx +dependencies.osx-ios = target-toolchain-1-osx \ libffi-3.2.1-2-darwin-ios \ clang-llvm-5.0.0-darwin-macos \ - target-sysroot-2-darwin-ios + target-sysroot-3-darwin-ios + +target-sysroot-3-darwin-ios.default = \ + remote:internal \ + /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.2.sdk + +target-sysroot-3-darwin-ios.alt = \ + /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk arch.ios = arm64 entrySelector.ios = -alias _Konan_main _main -targetSysRoot.ios = target-sysroot-2-darwin-ios +targetSysRoot.ios = target-sysroot-3-darwin-ios libffiDir.ios = libffi-3.2.1-2-darwin-ios llvmLtoFlags.ios = llvmLtoOptFlags.ios = -O3 -function-sections @@ -71,28 +90,35 @@ linkerNoDebugFlags.ios = -S linkerDynamicFlags.ios = -S -dylib llvmLtoNooptFlags.ios = -O1 llvmLtoDynamicFlags.ios = -relocation-model=pic -linkerKonanFlags.ios = -lc++ -lobjc -framework Foundation -sdk_version 10.2 +linkerKonanFlags.ios = -lc++ -lobjc -framework Foundation -sdk_version 11.2 linkerOptimizationFlags.ios = -dead_strip osVersionMinFlagLd.ios = -iphoneos_version_min osVersionMinFlagClang.ios = -miphoneos-version-min osVersionMin.ios = 8.0 # Apple iOS simulator. -targetToolchain.osx-ios_sim = clang-llvm-5.0.0-darwin-macos -dependencies.osx-ios_sim = target-sysroot-1-darwin-macos \ - libffi-3.2.1-2-darwin-ios_sim \ +targetToolchain.osx-ios_sim = target-toolchain-1-osx +dependencies.osx-ios_sim = target-toolchain-1-osx \ + libffi-3.2.1-1-darwin-ios_sim \ clang-llvm-5.0.0-darwin-macos \ - target-sysroot-1-darwin-ios_sim + target-sysroot-2-darwin-ios_sim + +target-sysroot-2-darwin-ios_sim.default = \ + remote:internal \ + /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator11.2.sdk + +target-sysroot-2-darwin-ios_sim.alt = \ + /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk arch.ios_sim = x86_64 entrySelector.ios_sim = -alias _Konan_main _main -targetSysRoot.ios_sim = target-sysroot-1-darwin-ios-sim -libffiDir.ios_sim = libffi-3.2.1-2-darwin-ios-sim +targetSysRoot.ios_sim = target-sysroot-2-darwin-ios_sim +libffiDir.ios_sim = libffi-3.2.1-1-darwin-ios_sim llvmLtoFlags.ios_sim = llvmLtoOptFlags.ios_sim = -O3 -function-sections llvmLtoNooptFlags.ios_sim = -O1 llvmLtoDynamicFlags.ios_sim = -relocation-model=pic -linkerKonanFlags.ios_sim = -lc++ -lobjc -framework Foundation -sdk_version 10.2 +linkerKonanFlags.ios_sim = -lc++ -lobjc -framework Foundation -sdk_version 11.2 linkerOptimizationFlags.ios_sim = -dead_strip linkerNoDebugFlags.ios_sim = -S linkerDynamicFlags.ios_sim = -S -dylib diff --git a/klib/src/platform/ios/AVFoundation.def b/klib/src/platform/ios/AVFoundation.def index 0e9e6d7fd48..1897ed8b681 100644 --- a/klib/src/platform/ios/AVFoundation.def +++ b/klib/src/platform/ios/AVFoundation.def @@ -1,4 +1,4 @@ -depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo EAGL Foundation MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix +depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix language = Objective-C package = platform.AVFoundation headers = AVFoundation/AVFoundation.h AVFoundation/AVFAudio.h AVFoundation/AVAudioBuffer.h diff --git a/klib/src/platform/ios/AVKit.def b/klib/src/platform/ios/AVKit.def index f535b4ba677..c2cc5e751d1 100644 --- a/klib/src/platform/ios/AVKit.def +++ b/klib/src/platform/ios/AVKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.AVKit headers = AVKit/AVKit.h diff --git a/klib/src/platform/ios/Accelerate.def b/klib/src/platform/ios/Accelerate.def index 3a708859b04..623891a3978 100644 --- a/klib/src/platform/ios/Accelerate.def +++ b/klib/src/platform/ios/Accelerate.def @@ -1,4 +1,4 @@ -depends = CoreFoundation CoreGraphics CoreVideo darwin posix +depends = CoreFoundation CoreGraphics CoreVideo IOSurface darwin posix language = Objective-C package = platform.Accelerate headers = Accelerate/Accelerate.h diff --git a/klib/src/platform/ios/AddressBookUI.def b/klib/src/platform/ios/AddressBookUI.def index 864768b181c..6fc852f0f66 100644 --- a/klib/src/platform/ios/AddressBookUI.def +++ b/klib/src/platform/ios/AddressBookUI.def @@ -1,4 +1,4 @@ -depends = AddressBook CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = AddressBook CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.AddressBookUI headers = AddressBookUI/AddressBookUI.h diff --git a/klib/src/platform/ios/ContactsUI.def b/klib/src/platform/ios/ContactsUI.def index 89379b51d8d..30f06312876 100644 --- a/klib/src/platform/ios/ContactsUI.def +++ b/klib/src/platform/ios/ContactsUI.def @@ -1,4 +1,4 @@ -depends = CFNetwork Contacts CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork Contacts CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.ContactsUI headers = ContactsUI/ContactsUI.h diff --git a/klib/src/platform/ios/CoreAudioKit.def b/klib/src/platform/ios/CoreAudioKit.def index 4273d4d67bc..85d80c2aad4 100644 --- a/klib/src/platform/ios/CoreAudioKit.def +++ b/klib/src/platform/ios/CoreAudioKit.def @@ -1,4 +1,4 @@ -depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.CoreAudioKit headers = CoreAudioKit/CoreAudioKit.h diff --git a/klib/src/platform/ios/CoreImage.def b/klib/src/platform/ios/CoreImage.def index b67509ba69b..4f2b0b38e39 100644 --- a/klib/src/platform/ios/CoreImage.def +++ b/klib/src/platform/ios/CoreImage.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreVideo EAGL Foundation Metal OpenGLESCommon Security darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon Security darwin posix language = Objective-C package = platform.CoreImage headers = CoreImage/CoreImage.h diff --git a/klib/src/platform/ios/CoreMedia.def b/klib/src/platform/ios/CoreMedia.def index 555a02e66ee..0e2fa0f36c2 100644 --- a/klib/src/platform/ios/CoreMedia.def +++ b/klib/src/platform/ios/CoreMedia.def @@ -1,4 +1,4 @@ -depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreVideo Foundation Metal OpenGLESCommon Security darwin posix +depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix language = Objective-C package = platform.CoreMedia headers = CoreMedia/CoreMedia.h diff --git a/klib/src/platform/ios/CoreVideo.def b/klib/src/platform/ios/CoreVideo.def index c1407e08e85..79b575207ae 100644 --- a/klib/src/platform/ios/CoreVideo.def +++ b/klib/src/platform/ios/CoreVideo.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics Foundation Metal OpenGLESCommon Security darwin posix +depends = CFNetwork CoreFoundation CoreGraphics Foundation IOSurface Metal OpenGLESCommon Security darwin posix language = Objective-C package = platform.CoreVideo headers = CoreVideo/CoreVideo.h diff --git a/klib/src/platform/ios/EventKitUI.def b/klib/src/platform/ios/EventKitUI.def index fe141c53eae..55b011ba9c9 100644 --- a/klib/src/platform/ios/EventKitUI.def +++ b/klib/src/platform/ios/EventKitUI.def @@ -1,4 +1,4 @@ -depends = AddressBook CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL EventKit Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = AddressBook CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL EventKit FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.EventKitUI headers = EventKitUI/EventKitUI.h diff --git a/klib/src/platform/ios/FileProvider.def b/klib/src/platform/ios/FileProvider.def new file mode 100644 index 00000000000..8d1feed135b --- /dev/null +++ b/klib/src/platform/ios/FileProvider.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation CoreGraphics Foundation Security darwin posix +language = Objective-C +package = platform.FileProvider +headers = FileProvider/FileProvider.h + +headerFilter = FileProvider/** + +compilerOpts = -framework FileProvider +linkerOpts = -framework FileProvider diff --git a/klib/src/platform/ios/GLKit.def b/klib/src/platform/ios/GLKit.def index cc29a69a401..0ef414dffad 100644 --- a/klib/src/platform/ios/GLKit.def +++ b/klib/src/platform/ios/GLKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal ModelIO OpenGLES2 OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal ModelIO OpenGLES2 OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.GLKit headers = GLKit/GLKit.h diff --git a/klib/src/platform/ios/GameController.def b/klib/src/platform/ios/GameController.def index b13d8b7c838..2ec2ee0b3c0 100644 --- a/klib/src/platform/ios/GameController.def +++ b/klib/src/platform/ios/GameController.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.GameController headers = GameController/GameController.h diff --git a/klib/src/platform/ios/GameKit.def b/klib/src/platform/ios/GameKit.def index 9329ed75f4f..337dc98ab34 100644 --- a/klib/src/platform/ios/GameKit.def +++ b/klib/src/platform/ios/GameKit.def @@ -1,4 +1,4 @@ -depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL Foundation GLKit GameController GameplayKit MediaToolbox Metal MetalKit ModelIO OpenGLESCommon QuartzCore ReplayKit SceneKit Security SpriteKit UIKit darwin posix +depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation GLKit GameController GameplayKit IOSurface ImageIO MediaToolbox Metal MetalKit ModelIO OpenGLESCommon QuartzCore ReplayKit SceneKit Security SpriteKit UIKit darwin posix language = Objective-C package = platform.GameKit headers = GameKit/GameKit.h diff --git a/klib/src/platform/ios/GameplayKit.def b/klib/src/platform/ios/GameplayKit.def index 0533da1fde3..7d553c475ec 100644 --- a/klib/src/platform/ios/GameplayKit.def +++ b/klib/src/platform/ios/GameplayKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation GLKit Metal OpenGLESCommon QuartzCore Security SpriteKit UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore SceneKit Security SpriteKit UIKit darwin posix language = Objective-C package = platform.GameplayKit headers = GameplayKit/GameplayKit.h diff --git a/klib/src/platform/ios/HealthKitUI.def b/klib/src/platform/ios/HealthKitUI.def index ae5d094e358..a765c65faa2 100644 --- a/klib/src/platform/ios/HealthKitUI.def +++ b/klib/src/platform/ios/HealthKitUI.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation HealthKit Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation HealthKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.HealthKitUI headers = HealthKitUI/HealthKitUI.h diff --git a/klib/src/platform/ios/HomeKit.def b/klib/src/platform/ios/HomeKit.def index 0f7beb79787..09472ba421f 100644 --- a/klib/src/platform/ios/HomeKit.def +++ b/klib/src/platform/ios/HomeKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.HomeKit headers = HomeKit/HomeKit.h diff --git a/klib/src/platform/ios/IOSurface.def b/klib/src/platform/ios/IOSurface.def new file mode 100644 index 00000000000..58d06905e15 --- /dev/null +++ b/klib/src/platform/ios/IOSurface.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation Foundation Security darwin posix +language = Objective-C +package = platform.IOSurface +headers.ios = IOSurface/IOSurfaceRef.h IOSurface/IOSurfaceObjC.h + +headerFilter = IOSurface/** + +compilerOpts = -framework IOSurface +linkerOpts = -framework IOSurface diff --git a/klib/src/platform/ios/Intents.def b/klib/src/platform/ios/Intents.def index 8bf4080fcd7..44a07a2efce 100644 --- a/klib/src/platform/ios/Intents.def +++ b/klib/src/platform/ios/Intents.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreLocation Foundation Security darwin posix +depends = CFNetwork Contacts CoreFoundation CoreLocation Foundation Security darwin posix language = Objective-C package = platform.Intents headers = Intents/Intents.h diff --git a/klib/src/platform/ios/IntentsUI.def b/klib/src/platform/ios/IntentsUI.def index 85d1889313e..747cc95dc0a 100644 --- a/klib/src/platform/ios/IntentsUI.def +++ b/klib/src/platform/ios/IntentsUI.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Intents Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Intents Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.IntentsUI headers = IntentsUI/IntentsUI.h diff --git a/klib/src/platform/ios/MapKit.def b/klib/src/platform/ios/MapKit.def index 5cb52aaa0e4..22cad520119 100644 --- a/klib/src/platform/ios/MapKit.def +++ b/klib/src/platform/ios/MapKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.MapKit headers = MapKit/MapKit.h diff --git a/klib/src/platform/ios/MediaPlayer.def b/klib/src/platform/ios/MediaPlayer.def index 65002747f23..13b6e828f39 100644 --- a/klib/src/platform/ios/MediaPlayer.def +++ b/klib/src/platform/ios/MediaPlayer.def @@ -1,4 +1,4 @@ -depends = AVFoundation CFNetwork CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = AVFoundation CFNetwork CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.MediaPlayer headers = MediaPlayer/MediaPlayer.h diff --git a/klib/src/platform/ios/MediaToolbox.def b/klib/src/platform/ios/MediaToolbox.def index cbd7afa2fe1..4d6d8de174c 100644 --- a/klib/src/platform/ios/MediaToolbox.def +++ b/klib/src/platform/ios/MediaToolbox.def @@ -1,4 +1,4 @@ -depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo Foundation Metal OpenGLESCommon Security darwin posix +depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix language = Objective-C package = platform.MediaToolbox headers = MediaToolbox/MediaToolbox.h diff --git a/klib/src/platform/ios/MessageUI.def b/klib/src/platform/ios/MessageUI.def index 9409d15ba9e..5862844befc 100644 --- a/klib/src/platform/ios/MessageUI.def +++ b/klib/src/platform/ios/MessageUI.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.MessageUI headers = MessageUI/MessageUI.h diff --git a/klib/src/platform/ios/Messages.def b/klib/src/platform/ios/Messages.def index 784b51fe251..5c6bf627f49 100644 --- a/klib/src/platform/ios/Messages.def +++ b/klib/src/platform/ios/Messages.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.Messages headers = Messages/Messages.h diff --git a/klib/src/platform/ios/Metal.def b/klib/src/platform/ios/Metal.def index bf1b5ce769e..2ca70daabb2 100644 --- a/klib/src/platform/ios/Metal.def +++ b/klib/src/platform/ios/Metal.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation Foundation Security darwin posix +depends = CFNetwork CoreFoundation Foundation IOSurface Security darwin posix language = Objective-C package = platform.Metal headers = Metal/Metal.h diff --git a/klib/src/platform/ios/MetalKit.def b/klib/src/platform/ios/MetalKit.def index b342d4a7ce1..066dd1a55d7 100644 --- a/klib/src/platform/ios/MetalKit.def +++ b/klib/src/platform/ios/MetalKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal ModelIO OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal ModelIO OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.MetalKit headers = MetalKit/MetalKit.h diff --git a/klib/src/platform/ios/MultipeerConnectivity.def b/klib/src/platform/ios/MultipeerConnectivity.def index 7816bc3d77e..2be06b8dc59 100644 --- a/klib/src/platform/ios/MultipeerConnectivity.def +++ b/klib/src/platform/ios/MultipeerConnectivity.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.MultipeerConnectivity headers = MultipeerConnectivity/MultipeerConnectivity.h diff --git a/klib/src/platform/ios/NotificationCenter.def b/klib/src/platform/ios/NotificationCenter.def index 37bb035e364..5c18ecf0763 100644 --- a/klib/src/platform/ios/NotificationCenter.def +++ b/klib/src/platform/ios/NotificationCenter.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.NotificationCenter headers = NotificationCenter/NotificationCenter.h diff --git a/klib/src/platform/ios/PassKit.def b/klib/src/platform/ios/PassKit.def index 4fbca70a0f4..9a4aef9ec52 100644 --- a/klib/src/platform/ios/PassKit.def +++ b/klib/src/platform/ios/PassKit.def @@ -1,4 +1,4 @@ -depends = AddressBook CFNetwork Contacts CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = AddressBook CFNetwork Contacts CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.PassKit headers = PassKit/PassKit.h diff --git a/klib/src/platform/ios/Photos.def b/klib/src/platform/ios/Photos.def index 3b1204ee325..19287cb6cf0 100644 --- a/klib/src/platform/ios/Photos.def +++ b/klib/src/platform/ios/Photos.def @@ -1,4 +1,4 @@ -depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia CoreText CoreVideo EAGL Foundation ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.Photos headers = Photos/Photos.h diff --git a/klib/src/platform/ios/PhotosUI.def b/klib/src/platform/ios/PhotosUI.def index 15ef8e4855a..38e75cca1d3 100644 --- a/klib/src/platform/ios/PhotosUI.def +++ b/klib/src/platform/ios/PhotosUI.def @@ -1,4 +1,4 @@ -depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia CoreText CoreVideo EAGL Foundation ImageIO MediaToolbox Metal OpenGLESCommon Photos QuartzCore Security UIKit darwin posix +depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon Photos QuartzCore Security UIKit darwin posix language = Objective-C package = platform.PhotosUI headers = PhotosUI/PhotosUI.h diff --git a/klib/src/platform/ios/QuickLook.def b/klib/src/platform/ios/QuickLook.def index 38c75d959d1..1d6770b73d1 100644 --- a/klib/src/platform/ios/QuickLook.def +++ b/klib/src/platform/ios/QuickLook.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.QuickLook headers = QuickLook/QuickLook.h diff --git a/klib/src/platform/ios/ReplayKit.def b/klib/src/platform/ios/ReplayKit.def index 3de7b6e0fd9..1b43b1786df 100644 --- a/klib/src/platform/ios/ReplayKit.def +++ b/klib/src/platform/ios/ReplayKit.def @@ -1,4 +1,4 @@ -depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL Foundation MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.ReplayKit headers = ReplayKit/ReplayKit.h diff --git a/klib/src/platform/ios/SafariServices.def b/klib/src/platform/ios/SafariServices.def index a285472954f..4ea18396a76 100644 --- a/klib/src/platform/ios/SafariServices.def +++ b/klib/src/platform/ios/SafariServices.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.SafariServices headers = SafariServices/SafariServices.h diff --git a/klib/src/platform/ios/SceneKit.def b/klib/src/platform/ios/SceneKit.def index 239c9a754c5..bc3be4fbadc 100644 --- a/klib/src/platform/ios/SceneKit.def +++ b/klib/src/platform/ios/SceneKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation GLKit Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.SceneKit headers = SceneKit/SceneKit.h diff --git a/klib/src/platform/ios/Security.def b/klib/src/platform/ios/Security.def index 45988b495ba..78a3ffe5231 100644 --- a/klib/src/platform/ios/Security.def +++ b/klib/src/platform/ios/Security.def @@ -1,7 +1,7 @@ depends = CoreFoundation darwin posix language = Objective-C package = platform.Security -headers = Security/Security.h Security/SecurityFeatures.h Security/SecureTransport.h +headers = Security/Security.h Security/SecureTransport.h headerFilter = Security/** diff --git a/klib/src/platform/ios/Social.def b/klib/src/platform/ios/Social.def index dfb44b3ce62..b4f19cbd58e 100644 --- a/klib/src/platform/ios/Social.def +++ b/klib/src/platform/ios/Social.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.Social headers = Social/Social.h diff --git a/klib/src/platform/ios/Speech.def b/klib/src/platform/ios/Speech.def index c17f92a5911..3f8d873379d 100644 --- a/klib/src/platform/ios/Speech.def +++ b/klib/src/platform/ios/Speech.def @@ -1,4 +1,4 @@ -depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo EAGL Foundation MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix +depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix language = Objective-C package = platform.Speech headers = Speech/Speech.h diff --git a/klib/src/platform/ios/SpriteKit.def b/klib/src/platform/ios/SpriteKit.def index 56ae9a73958..8a917797a9b 100644 --- a/klib/src/platform/ios/SpriteKit.def +++ b/klib/src/platform/ios/SpriteKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation GLKit Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.SpriteKit headers = SpriteKit/SpriteKit.h diff --git a/klib/src/platform/ios/StoreKit.def b/klib/src/platform/ios/StoreKit.def index 2480a02212c..52f73f1095f 100644 --- a/klib/src/platform/ios/StoreKit.def +++ b/klib/src/platform/ios/StoreKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.StoreKit headers = StoreKit/StoreKit.h diff --git a/klib/src/platform/ios/Twitter.def b/klib/src/platform/ios/Twitter.def index fb049320428..fef9e4df172 100644 --- a/klib/src/platform/ios/Twitter.def +++ b/klib/src/platform/ios/Twitter.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security Social UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security Social UIKit darwin posix language = Objective-C package = platform.Twitter headers = Twitter/Twitter.h diff --git a/klib/src/platform/ios/UIKit.def b/klib/src/platform/ios/UIKit.def index 865d1f56310..e28f6da5e87 100644 --- a/klib/src/platform/ios/UIKit.def +++ b/klib/src/platform/ios/UIKit.def @@ -1,9 +1,9 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security darwin posix language = Objective-C package = platform.UIKit headers = UIKit/UIKit.h -headerFilter = UIKit/** +headerFilter = UIKit/** DocumentManager/** compilerOpts = -framework UIKit linkerOpts = -framework UIKit diff --git a/klib/src/platform/ios/UserNotificationsUI.def b/klib/src/platform/ios/UserNotificationsUI.def index 2bde4fee884..bd8f8acbca8 100644 --- a/klib/src/platform/ios/UserNotificationsUI.def +++ b/klib/src/platform/ios/UserNotificationsUI.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.UserNotificationsUI headers = UserNotificationsUI/UserNotificationsUI.h diff --git a/klib/src/platform/ios/VideoToolbox.def b/klib/src/platform/ios/VideoToolbox.def index 190e18f8779..570d9121f49 100644 --- a/klib/src/platform/ios/VideoToolbox.def +++ b/klib/src/platform/ios/VideoToolbox.def @@ -1,4 +1,4 @@ -depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMedia CoreVideo Foundation Metal OpenGLESCommon Security darwin posix +depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMedia CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix language = Objective-C package = platform.VideoToolbox headers = VideoToolbox/VideoToolbox.h diff --git a/klib/src/platform/ios/WatchKit.def b/klib/src/platform/ios/WatchKit.def index f1c6ab7a4cf..4c9b230b2a3 100644 --- a/klib/src/platform/ios/WatchKit.def +++ b/klib/src/platform/ios/WatchKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL Foundation MapKit Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MapKit Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.WatchKit headers = WatchKit/WatchKit.h diff --git a/klib/src/platform/ios/WebKit.def b/klib/src/platform/ios/WebKit.def index d08912c6ff4..6b3ee92bbc4 100644 --- a/klib/src/platform/ios/WebKit.def +++ b/klib/src/platform/ios/WebKit.def @@ -1,4 +1,4 @@ -depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.WebKit headers = WebKit/WebKit.h diff --git a/klib/src/platform/ios/darwin.def b/klib/src/platform/ios/darwin.def index b77955dbd0b..76bf96153ba 100644 --- a/klib/src/platform/ios/darwin.def +++ b/klib/src/platform/ios/darwin.def @@ -22,6 +22,7 @@ headers = AppleTextureEncoder.h AssertMacros.h Availability.h AvailabilityIntern ttyent.h \ unwind.h util.h utmpx.h vis.h wordexp.h xattr_flags.h \ bank/bank_types.h \ + bsm/audit.h \ os/activity.h os/availability.h os/base.h os/lock.h \ os/object.h os/overflow.h os/trace.h # simd/simd.h diff --git a/klib/src/platform/ios/iAd.def b/klib/src/platform/ios/iAd.def index 078ec97066e..e144eb2164d 100644 --- a/klib/src/platform/ios/iAd.def +++ b/klib/src/platform/ios/iAd.def @@ -1,4 +1,4 @@ -depends = AVFoundation AVKit CFNetwork CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL Foundation MediaPlayer Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +depends = AVFoundation AVKit AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaPlayer MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix language = Objective-C package = platform.iAd headers = iAd/iAd.h diff --git a/klib/src/platform/osx/IOSurface.def b/klib/src/platform/osx/IOSurface.def index e60041fc12d..05090ca56fa 100644 --- a/klib/src/platform/osx/IOSurface.def +++ b/klib/src/platform/osx/IOSurface.def @@ -1,7 +1,7 @@ -depends = CoreFoundation IOKit libkern osx posix +depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreServices CoreText DiskArbitration Foundation IOKit ImageIO Security libkern osx posix language = Objective-C package = platform.IOSurface -headers = IOSurface/IOSurface.h +headers = IOSurface/IOSurface.h IOSurface/IOSurfaceObjC.h headerFilter = IOSurface/** diff --git a/klib/src/platform/osx/Security.def b/klib/src/platform/osx/Security.def index 19953f96cc7..93d87b74062 100644 --- a/klib/src/platform/osx/Security.def +++ b/klib/src/platform/osx/Security.def @@ -1,7 +1,7 @@ depends = CoreFoundation osx posix language = Objective-C package = platform.Security -headers = Security/Security.h Security/SecurityFeatures.h Security/SecureTransport.h +headers = Security/Security.h Security/SecureTransport.h headerFilter = Security/** excludedFunctions = CSSMOID_APPLE_EXTENSION_DEVELOPER_AUTHENTICATION CSSMOID_APPLE_EXTENSION_PROVISIONING_PROFILE_SIGNING \ diff --git a/klib/src/platform/osx/posix.def b/klib/src/platform/osx/posix.def index 21ee81fca6b..f0229e307af 100644 --- a/klib/src/platform/osx/posix.def +++ b/klib/src/platform/osx/posix.def @@ -9,7 +9,7 @@ headers = alloca.h ar.h assert.h complex.h dirent.h dlfcn.h err.h errno.h fcntl. net/ethernet.h net/if.h net/if_arp.h net/route.h \ netinet/icmp6.h netinet/if_ether.h netinet/in.h netinet/in_systm.h \ netinet/ip.h netinet/ip6.h netinet/ip_icmp.h netinet/tcp.h netinet/udp.h \ - sys/ioctl.h sys/ipc.h sys/mman.h sys/poll.h sys/ptrace.h \ + sys/acl.h sys/ioctl.h sys/ipc.h sys/mman.h sys/poll.h sys/ptrace.h \ sys/queue.h sys/select.h sys/shm.h sys/socket.h sys/stat.h \ sys/syslimits.h sys/time.h sys/times.h sys/utsname.h sys/wait.h @@ -19,7 +19,7 @@ excludedFunctions = KERNEL_AUDIT_TOKEN KERNEL_SECURITY_TOKEN add_profil addrsel_policy_init \ in6addr_linklocal_allv2routers \ pfctlinput regwnexec_l res_send_setqhook res_send_setrhook \ - unwhiteout zopen profil openat + unwhiteout zopen profil openat acl_valid_link_np linkerOpts = -ldl -lresolv --- diff --git a/samples/objc/src/main/kotlin/Window.kt b/samples/objc/src/main/kotlin/Window.kt index 097dc28ed89..22adfa622d6 100644 --- a/samples/objc/src/main/kotlin/Window.kt +++ b/samples/objc/src/main/kotlin/Window.kt @@ -48,7 +48,7 @@ private class MyAppDelegate() : NSObject(), NSApplicationDelegateProtocol { releasedWhenClosed = false delegate = object : NSObject(), NSWindowDelegateProtocol { - override fun windowShouldClose(sender: ObjCObject): Boolean { + override fun windowShouldClose(sender: NSWindow): Boolean { NSApplication.sharedApplication().stop(this) return true } diff --git a/samples/tetris/build.gradle b/samples/tetris/build.gradle index 44a84c30c18..038ae6f3e90 100644 --- a/samples/tetris/build.gradle +++ b/samples/tetris/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'konan' -konan.targets = ['macbook', 'linux', 'iphone', 'raspberrypi'] +konan.targets = ['macbook', 'linux', 'raspberrypi'] konanArtifacts { @@ -19,10 +19,6 @@ konanArtifacts { includeDirs '/usr/include/SDL2' } - target 'iphone', { - includeDirs "${System.getProperty("user.home")}/.konan/dependencies/target-sysroot-2-darwin-ios/System/Library/Frameworks/SDL2.framework/Headers" - } - target 'raspberrypi', { includeDirs "${System.getProperty("user.home")}/.konan/dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2" } @@ -43,13 +39,6 @@ konanArtifacts { linkerOpts '-L/usr/lib/x86_64-linux-gnu -lSDL2' } - target 'iphone', { - linkerOpts '-framework SDL2 -framework AVFoundation -framework CoreGraphics -framework CoreMotion ' + - '-framework Foundation -framework GameController -framework AudioToolbox -framework OpenGLES ' + - '-framework QuartzCore -framework UIKit' - noMain true - } - target 'raspberrypi', { linkerOpts '-lSDL2' } diff --git a/samples/tetris/build.sh b/samples/tetris/build.sh index 416c7310ea1..d077446c711 100755 --- a/samples/tetris/build.sh +++ b/samples/tetris/build.sh @@ -19,12 +19,6 @@ CFLAGS_linux=-I/usr/include/SDL2 LINKER_ARGS_linux="-L/usr/lib/x86_64-linux-gnu -lSDL2" COMPILER_ARGS_linux= -CFLAGS_iphone=-I$DEPS/target-sysroot-2-darwin-ios/System/Library/Frameworks/SDL2.framework/Headers -LINKER_ARGS_iphone="-framework SDL2 \ --framework AVFoundation -framework CoreGraphics -framework CoreMotion -framework Foundation -framework GameController \ --framework AudioToolbox -framework OpenGLES -framework QuartzCore -framework UIKit" -COMPILER_ARGS_iphone=-nomain - CFLAGS_raspberrypi=-I$DEPS/target-sysroot-1-raspberrypi/usr/include/SDL2 LINKER_ARGS_raspberrypi="-lSDL2" COMPILER_ARGS_raspberrypi= diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt index 8471940caa6..b4bf6c61adb 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt @@ -106,7 +106,7 @@ class ClangHostArgs(val hostProperties: KonanProperties) { val binDir = when(TargetManager.host) { KonanTarget.LINUX -> "$targetToolchain/bin" KonanTarget.MINGW -> "$sysRoot/bin" - KonanTarget.MACBOOK -> "$sysRoot/usr/bin" + KonanTarget.MACBOOK -> "$targetToolchain/usr/bin" else -> throw TargetSupportException("Unexpected host platform") } diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanTarget.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanTarget.kt index 44b1c7f9bc9..f36feeb1c33 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanTarget.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanTarget.kt @@ -185,7 +185,7 @@ class TargetManager(val userRequest: String? = null) { KonanTarget.MACBOOK -> { KonanTarget.MACBOOK.enabled = true KonanTarget.IPHONE.enabled = true - //KonanTarget.IPHONE_SIM.enabled = true + KonanTarget.IPHONE_SIM.enabled = true KonanTarget.ANDROID_ARM32.enabled = true KonanTarget.ANDROID_ARM64.enabled = true KonanTarget.WASM32.enabled = true