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
This commit is contained in:
Svyatoslav Scherbina
2017-12-08 14:16:32 +03:00
committed by SvyatoslavScherbina
parent 905390cd45
commit 07fce11780
62 changed files with 123 additions and 93 deletions
@@ -48,7 +48,7 @@ fun KonanProperties.defaultCompilerOpts(): List<String> {
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())
}
+2 -1
View File
@@ -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:
+2
View File
@@ -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).
@@ -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
+42 -16
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+9
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+9
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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/**
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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/**
+1 -1
View File
@@ -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 \
+2 -2
View File
@@ -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
---
+1 -1
View File
@@ -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
}
+1 -12
View File
@@ -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'
}
-6
View File
@@ -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=
@@ -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")
}
@@ -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