From 7dba019a14e246eab4c71854cec348caf34db48c Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Tue, 18 Sep 2018 16:02:48 +0300 Subject: [PATCH] Add missing iOS platform libs and update dependencies --- platformLibs/src/platform/ios/ARKit.def | 9 +++++++++ platformLibs/src/platform/ios/AuthenticationServices.def | 9 +++++++++ platformLibs/src/platform/ios/BusinessChat.def | 9 +++++++++ platformLibs/src/platform/ios/CarPlay.def | 9 +++++++++ platformLibs/src/platform/ios/ClassKit.def | 2 +- platformLibs/src/platform/ios/CoreML.def | 2 +- platformLibs/src/platform/ios/CoreNFC.def | 9 +++++++++ platformLibs/src/platform/ios/CoreServices.def | 9 +++++++++ platformLibs/src/platform/ios/DeviceCheck.def | 9 +++++++++ platformLibs/src/platform/ios/FileProviderUI.def | 9 +++++++++ platformLibs/src/platform/ios/IOSurface.def | 1 + platformLibs/src/platform/ios/IdentityLookup.def | 9 +++++++++ platformLibs/src/platform/ios/IdentityLookupUI.def | 9 +++++++++ platformLibs/src/platform/ios/Intents.def | 2 +- .../src/platform/ios/MetalPerformanceShaders.def | 9 +++++++++ platformLibs/src/platform/ios/MobileCoreServices.def | 2 +- platformLibs/src/platform/ios/NaturalLanguage.def | 9 +++++++++ platformLibs/src/platform/ios/Network.def | 9 +++++++++ platformLibs/src/platform/ios/OpenGLES.def | 2 +- platformLibs/src/platform/ios/OpenGLES2.def | 2 +- platformLibs/src/platform/ios/OpenGLES3.def | 2 +- platformLibs/src/platform/ios/PDFKit.def | 9 +++++++++ platformLibs/src/platform/ios/Vision.def | 9 +++++++++ platformLibs/src/platform/ios/darwin.def | 6 ++++-- platformLibs/src/platform/ios/iAd.def | 2 +- platformLibs/src/platform/ios/posix.def | 2 +- platformLibs/src/platform/ios/set_depends.sh | 2 ++ platformLibs/src/platform/ios/zlib.def | 2 +- platformLibs/src/platform/osx/Accelerate.def | 2 +- platformLibs/src/platform/osx/CoreML.def | 2 +- platformLibs/src/platform/osx/CoreText.def | 2 +- platformLibs/src/platform/osx/GLUT.def | 2 +- platformLibs/src/platform/osx/OpenGL.def | 2 +- platformLibs/src/platform/osx/OpenGL3.def | 2 +- platformLibs/src/platform/osx/darwin.def | 6 ++++-- platformLibs/src/platform/osx/posix.def | 2 +- platformLibs/src/platform/osx/set_depends.sh | 2 ++ platformLibs/src/platform/osx/zlib.def | 2 +- 38 files changed, 166 insertions(+), 22 deletions(-) create mode 100644 platformLibs/src/platform/ios/ARKit.def create mode 100644 platformLibs/src/platform/ios/AuthenticationServices.def create mode 100644 platformLibs/src/platform/ios/BusinessChat.def create mode 100644 platformLibs/src/platform/ios/CarPlay.def create mode 100644 platformLibs/src/platform/ios/CoreNFC.def create mode 100644 platformLibs/src/platform/ios/CoreServices.def create mode 100644 platformLibs/src/platform/ios/DeviceCheck.def create mode 100644 platformLibs/src/platform/ios/FileProviderUI.def create mode 100644 platformLibs/src/platform/ios/IdentityLookup.def create mode 100644 platformLibs/src/platform/ios/IdentityLookupUI.def create mode 100644 platformLibs/src/platform/ios/MetalPerformanceShaders.def create mode 100644 platformLibs/src/platform/ios/NaturalLanguage.def create mode 100644 platformLibs/src/platform/ios/Network.def create mode 100644 platformLibs/src/platform/ios/PDFKit.def create mode 100644 platformLibs/src/platform/ios/Vision.def create mode 100755 platformLibs/src/platform/ios/set_depends.sh create mode 100755 platformLibs/src/platform/osx/set_depends.sh diff --git a/platformLibs/src/platform/ios/ARKit.def b/platformLibs/src/platform/ios/ARKit.def new file mode 100644 index 00000000000..e94ebb4d66d --- /dev/null +++ b/platformLibs/src/platform/ios/ARKit.def @@ -0,0 +1,9 @@ +depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore SceneKit Security SpriteKit UIKit darwin posix +language = Objective-C +package = platform.ARKit +headers = ARKit/ARKit.h + +headerFilter = ARKit/** + +compilerOpts = -framework ARKit +linkerOpts = -framework ARKit diff --git a/platformLibs/src/platform/ios/AuthenticationServices.def b/platformLibs/src/platform/ios/AuthenticationServices.def new file mode 100644 index 00000000000..6adc79c9006 --- /dev/null +++ b/platformLibs/src/platform/ios/AuthenticationServices.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +language = Objective-C +package = platform.AuthenticationServices +headers = AuthenticationServices/AuthenticationServices.h + +headerFilter = AuthenticationServices/** + +compilerOpts = -framework AuthenticationServices +linkerOpts = -framework AuthenticationServices diff --git a/platformLibs/src/platform/ios/BusinessChat.def b/platformLibs/src/platform/ios/BusinessChat.def new file mode 100644 index 00000000000..79278132c54 --- /dev/null +++ b/platformLibs/src/platform/ios/BusinessChat.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +language = Objective-C +package = platform.BusinessChat +headers = BusinessChat/BusinessChat.h + +headerFilter = BusinessChat/** + +compilerOpts = -framework BusinessChat +linkerOpts = -framework BusinessChat diff --git a/platformLibs/src/platform/ios/CarPlay.def b/platformLibs/src/platform/ios/CarPlay.def new file mode 100644 index 00000000000..6d7dceb8bc8 --- /dev/null +++ b/platformLibs/src/platform/ios/CarPlay.def @@ -0,0 +1,9 @@ +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.CarPlay +headers = CarPlay/CarPlay.h + +headerFilter = CarPlay/** + +compilerOpts = -framework CarPlay +linkerOpts = -framework CarPlay diff --git a/platformLibs/src/platform/ios/ClassKit.def b/platformLibs/src/platform/ios/ClassKit.def index 371dee66cdf..0a91c76ced5 100644 --- a/platformLibs/src/platform/ios/ClassKit.def +++ b/platformLibs/src/platform/ios/ClassKit.def @@ -1,4 +1,4 @@ -depends = CoreFoundation Foundation darwin posix +depends = CFNetwork CoreFoundation Foundation Security darwin posix language = Objective-C package = platform.ClassKit headers = ClassKit/ClassKit.h diff --git a/platformLibs/src/platform/ios/CoreML.def b/platformLibs/src/platform/ios/CoreML.def index 08d5fefaf97..0dd9ea4c71d 100644 --- a/platformLibs/src/platform/ios/CoreML.def +++ b/platformLibs/src/platform/ios/CoreML.def @@ -1,4 +1,4 @@ -depends = CoreVideo CoreFoundation Foundation darwin posix +depends = CFNetwork CoreFoundation CoreGraphics CoreVideo Foundation IOSurface Security darwin posix language = Objective-C package = platform.CoreML headers = CoreML/CoreML.h diff --git a/platformLibs/src/platform/ios/CoreNFC.def b/platformLibs/src/platform/ios/CoreNFC.def new file mode 100644 index 00000000000..bb2c0f67af4 --- /dev/null +++ b/platformLibs/src/platform/ios/CoreNFC.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation Foundation Security darwin posix +language = Objective-C +package = platform.CoreNFC +headers = CoreNFC/CoreNFC.h + +headerFilter = CoreNFC/** + +compilerOpts = -framework CoreNFC +linkerOpts = -framework CoreNFC diff --git a/platformLibs/src/platform/ios/CoreServices.def b/platformLibs/src/platform/ios/CoreServices.def new file mode 100644 index 00000000000..3917f3ea7f9 --- /dev/null +++ b/platformLibs/src/platform/ios/CoreServices.def @@ -0,0 +1,9 @@ +depends = CoreFoundation darwin posix +language = Objective-C +package = platform.CoreServices +headers = CoreServices/CoreServices.h + +headerFilter = CoreServices/** + +compilerOpts = -framework CoreServices +linkerOpts = -framework CoreServices diff --git a/platformLibs/src/platform/ios/DeviceCheck.def b/platformLibs/src/platform/ios/DeviceCheck.def new file mode 100644 index 00000000000..553934a15a2 --- /dev/null +++ b/platformLibs/src/platform/ios/DeviceCheck.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation Foundation Security darwin posix +language = Objective-C +package = platform.DeviceCheck +headers = DeviceCheck/DeviceCheck.h + +headerFilter = DeviceCheck/** + +compilerOpts = -framework DeviceCheck +linkerOpts = -framework DeviceCheck diff --git a/platformLibs/src/platform/ios/FileProviderUI.def b/platformLibs/src/platform/ios/FileProviderUI.def new file mode 100644 index 00000000000..e16fe8a3b92 --- /dev/null +++ b/platformLibs/src/platform/ios/FileProviderUI.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +language = Objective-C +package = platform.FileProviderUI +headers = FileProviderUI/FileProviderUI.h + +headerFilter = FileProviderUI/** + +compilerOpts = -framework FileProviderUI +linkerOpts = -framework FileProviderUI diff --git a/platformLibs/src/platform/ios/IOSurface.def b/platformLibs/src/platform/ios/IOSurface.def index b9d970a9876..2a7594924a9 100644 --- a/platformLibs/src/platform/ios/IOSurface.def +++ b/platformLibs/src/platform/ios/IOSurface.def @@ -1,6 +1,7 @@ depends = CFNetwork CoreFoundation Foundation Security darwin posix language = Objective-C package = platform.IOSurface +headers.ios_arm32 = IOSurface/IOSurfaceRef.h IOSurface/IOSurfaceObjC.h headers.ios_arm64 = IOSurface/IOSurfaceRef.h IOSurface/IOSurfaceObjC.h headerFilter = IOSurface/** diff --git a/platformLibs/src/platform/ios/IdentityLookup.def b/platformLibs/src/platform/ios/IdentityLookup.def new file mode 100644 index 00000000000..46140196977 --- /dev/null +++ b/platformLibs/src/platform/ios/IdentityLookup.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation Foundation Security darwin posix +language = Objective-C +package = platform.IdentityLookup +headers = IdentityLookup/IdentityLookup.h + +headerFilter = IdentityLookup/** + +compilerOpts = -framework IdentityLookup +linkerOpts = -framework IdentityLookup diff --git a/platformLibs/src/platform/ios/IdentityLookupUI.def b/platformLibs/src/platform/ios/IdentityLookupUI.def new file mode 100644 index 00000000000..b73ccbeac45 --- /dev/null +++ b/platformLibs/src/platform/ios/IdentityLookupUI.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface IdentityLookup ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +language = Objective-C +package = platform.IdentityLookupUI +headers = IdentityLookupUI/IdentityLookupUI.h + +headerFilter = IdentityLookupUI/** + +compilerOpts = -framework IdentityLookupUI +linkerOpts = -framework IdentityLookupUI diff --git a/platformLibs/src/platform/ios/Intents.def b/platformLibs/src/platform/ios/Intents.def index 44a07a2efce..8bf4080fcd7 100644 --- a/platformLibs/src/platform/ios/Intents.def +++ b/platformLibs/src/platform/ios/Intents.def @@ -1,4 +1,4 @@ -depends = CFNetwork Contacts CoreFoundation CoreLocation Foundation Security darwin posix +depends = CFNetwork CoreFoundation CoreLocation Foundation Security darwin posix language = Objective-C package = platform.Intents headers = Intents/Intents.h diff --git a/platformLibs/src/platform/ios/MetalPerformanceShaders.def b/platformLibs/src/platform/ios/MetalPerformanceShaders.def new file mode 100644 index 00000000000..15a5c576436 --- /dev/null +++ b/platformLibs/src/platform/ios/MetalPerformanceShaders.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation CoreGraphics Foundation IOSurface Metal Security darwin posix +language = Objective-C +package = platform.MetalPerformanceShaders +headers = MetalPerformanceShaders/MetalPerformanceShaders.h + +headerFilter = MetalPerformanceShaders/** MPSNeuralNetwork/** MPSImage/** MPSCore/** MPSMatrix/** MPSRayIntersector/** + +compilerOpts = -framework MetalPerformanceShaders +linkerOpts = -framework MetalPerformanceShaders diff --git a/platformLibs/src/platform/ios/MobileCoreServices.def b/platformLibs/src/platform/ios/MobileCoreServices.def index 1be7217677a..77b8e484769 100644 --- a/platformLibs/src/platform/ios/MobileCoreServices.def +++ b/platformLibs/src/platform/ios/MobileCoreServices.def @@ -1,4 +1,4 @@ -depends = CoreFoundation darwin posix +depends = CoreFoundation CoreServices darwin posix language = Objective-C package = platform.MobileCoreServices headers = MobileCoreServices/MobileCoreServices.h diff --git a/platformLibs/src/platform/ios/NaturalLanguage.def b/platformLibs/src/platform/ios/NaturalLanguage.def new file mode 100644 index 00000000000..8a2dde50f89 --- /dev/null +++ b/platformLibs/src/platform/ios/NaturalLanguage.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation CoreGraphics CoreML CoreVideo Foundation IOSurface Security darwin posix +language = Objective-C +package = platform.NaturalLanguage +headers = NaturalLanguage/NaturalLanguage.h + +headerFilter = NaturalLanguage/** + +compilerOpts = -framework NaturalLanguage +linkerOpts = -framework NaturalLanguage diff --git a/platformLibs/src/platform/ios/Network.def b/platformLibs/src/platform/ios/Network.def new file mode 100644 index 00000000000..e5abbacfdc4 --- /dev/null +++ b/platformLibs/src/platform/ios/Network.def @@ -0,0 +1,9 @@ +depends = CoreFoundation Security darwin posix +language = Objective-C +package = platform.Network +headers = Network/Network.h + +headerFilter = Network/** + +compilerOpts = -framework Network +linkerOpts = -framework Network diff --git a/platformLibs/src/platform/ios/OpenGLES.def b/platformLibs/src/platform/ios/OpenGLES.def index 8b6a499b60f..5eb2b3ddb2f 100644 --- a/platformLibs/src/platform/ios/OpenGLES.def +++ b/platformLibs/src/platform/ios/OpenGLES.def @@ -1,4 +1,4 @@ -depends = OpenGLESCommon posix +depends = EAGL OpenGLESCommon darwin posix language = Objective-C package = platform.gles headers = OpenGLES/ES1/gl.h OpenGLES/ES1/glext.h diff --git a/platformLibs/src/platform/ios/OpenGLES2.def b/platformLibs/src/platform/ios/OpenGLES2.def index 8cda04026c8..6d030e35c48 100644 --- a/platformLibs/src/platform/ios/OpenGLES2.def +++ b/platformLibs/src/platform/ios/OpenGLES2.def @@ -1,4 +1,4 @@ -depends = OpenGLESCommon posix +depends = EAGL OpenGLESCommon darwin posix language = Objective-C package = platform.gles2 headers = OpenGLES/ES2/gl.h OpenGLES/ES2/glext.h diff --git a/platformLibs/src/platform/ios/OpenGLES3.def b/platformLibs/src/platform/ios/OpenGLES3.def index ff03b41615d..08e9586476c 100644 --- a/platformLibs/src/platform/ios/OpenGLES3.def +++ b/platformLibs/src/platform/ios/OpenGLES3.def @@ -1,4 +1,4 @@ -depends = OpenGLESCommon posix +depends = EAGL OpenGLESCommon darwin posix language = Objective-C package = platform.gles3 headers = OpenGLES/ES3/gl.h OpenGLES/ES3/glext.h diff --git a/platformLibs/src/platform/ios/PDFKit.def b/platformLibs/src/platform/ios/PDFKit.def new file mode 100644 index 00000000000..d1c4a1802c3 --- /dev/null +++ b/platformLibs/src/platform/ios/PDFKit.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix +language = Objective-C +package = platform.PDFKit +headers = PDFKit/PDFKit.h + +headerFilter = PDFKit/** + +compilerOpts = -framework PDFKit +linkerOpts = -framework PDFKit diff --git a/platformLibs/src/platform/ios/Vision.def b/platformLibs/src/platform/ios/Vision.def new file mode 100644 index 00000000000..8f716178f52 --- /dev/null +++ b/platformLibs/src/platform/ios/Vision.def @@ -0,0 +1,9 @@ +depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreML CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon Security darwin posix +language = Objective-C +package = platform.Vision +headers = Vision/Vision.h + +headerFilter = Vision/** + +compilerOpts = -framework Vision +linkerOpts = -framework Vision diff --git a/platformLibs/src/platform/ios/darwin.def b/platformLibs/src/platform/ios/darwin.def index 76bf96153ba..211a4e217d2 100644 --- a/platformLibs/src/platform/ios/darwin.def +++ b/platformLibs/src/platform/ios/darwin.def @@ -24,11 +24,13 @@ headers = AppleTextureEncoder.h AssertMacros.h Availability.h AvailabilityIntern 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 + os/log.h os/object.h os/overflow.h os/trace.h \ + simd/simd.h headerFilter = ** +excludedFunctions = __tg_promote + compilerOpts = -D_XOPEN_SOURCE linkerOpts = -ldl -lz diff --git a/platformLibs/src/platform/ios/iAd.def b/platformLibs/src/platform/ios/iAd.def index e144eb2164d..cc927b4423c 100644 --- a/platformLibs/src/platform/ios/iAd.def +++ b/platformLibs/src/platform/ios/iAd.def @@ -1,4 +1,4 @@ -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 +depends = AVFoundation AVKit 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.iAd headers = iAd/iAd.h diff --git a/platformLibs/src/platform/ios/posix.def b/platformLibs/src/platform/ios/posix.def index 28886785b76..f297df113ba 100644 --- a/platformLibs/src/platform/ios/posix.def +++ b/platformLibs/src/platform/ios/posix.def @@ -40,4 +40,4 @@ static int init_sockets() { } static void deinit_sockets() { -} \ No newline at end of file +} diff --git a/platformLibs/src/platform/ios/set_depends.sh b/platformLibs/src/platform/ios/set_depends.sh new file mode 100755 index 00000000000..bfcbaaf14f8 --- /dev/null +++ b/platformLibs/src/platform/ios/set_depends.sh @@ -0,0 +1,2 @@ +#!/bin/bash +../../../../dist/bin/run_konan defFileDependencies -target ios_arm32 -target ios_arm64 -target ios_x64 *.def diff --git a/platformLibs/src/platform/ios/zlib.def b/platformLibs/src/platform/ios/zlib.def index 69ee2779d23..8292dd723fa 100644 --- a/platformLibs/src/platform/ios/zlib.def +++ b/platformLibs/src/platform/ios/zlib.def @@ -1,7 +1,7 @@ depends = posix package = platform.zlib headers = zconf.h zlib.h -headerFilter = zlib.h +headerFilter = zconf.h zlib.h compilerOpts = -DByte=uByte -DBytef=uBytef linkerOpts = -lz diff --git a/platformLibs/src/platform/osx/Accelerate.def b/platformLibs/src/platform/osx/Accelerate.def index 623891a3978..a1470a628b7 100644 --- a/platformLibs/src/platform/osx/Accelerate.def +++ b/platformLibs/src/platform/osx/Accelerate.def @@ -1,4 +1,4 @@ -depends = CoreFoundation CoreGraphics CoreVideo IOSurface darwin posix +depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreServices CoreText CoreVideo DiskArbitration IOKit IOSurface ImageIO Security darwin libkern osx posix language = Objective-C package = platform.Accelerate headers = Accelerate/Accelerate.h diff --git a/platformLibs/src/platform/osx/CoreML.def b/platformLibs/src/platform/osx/CoreML.def index 08d5fefaf97..5a41afaef0d 100644 --- a/platformLibs/src/platform/osx/CoreML.def +++ b/platformLibs/src/platform/osx/CoreML.def @@ -1,4 +1,4 @@ -depends = CoreVideo CoreFoundation Foundation darwin posix +depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreServices CoreText CoreVideo DiskArbitration Foundation IOKit IOSurface ImageIO Security darwin libkern osx posix language = Objective-C package = platform.CoreML headers = CoreML/CoreML.h diff --git a/platformLibs/src/platform/osx/CoreText.def b/platformLibs/src/platform/osx/CoreText.def index 777002e0e56..ab1b86dc329 100644 --- a/platformLibs/src/platform/osx/CoreText.def +++ b/platformLibs/src/platform/osx/CoreText.def @@ -1,4 +1,4 @@ -depends = CoreFoundation CoreGraphics darwin posix +depends = CoreFoundation CoreGraphics IOKit darwin libkern posix language = Objective-C package = platform.CoreText headers = CoreText/CoreText.h diff --git a/platformLibs/src/platform/osx/GLUT.def b/platformLibs/src/platform/osx/GLUT.def index cc1e24ea03a..7ccf420a6c6 100644 --- a/platformLibs/src/platform/osx/GLUT.def +++ b/platformLibs/src/platform/osx/GLUT.def @@ -1,4 +1,4 @@ -depends = OpenGL OpenGLCommon posix +depends = OpenGL OpenGLCommon darwin posix language = Objective-C package = platform.GLUT headers = GLUT/glut.h diff --git a/platformLibs/src/platform/osx/OpenGL.def b/platformLibs/src/platform/osx/OpenGL.def index b44d55bd793..6a47add878c 100644 --- a/platformLibs/src/platform/osx/OpenGL.def +++ b/platformLibs/src/platform/osx/OpenGL.def @@ -1,4 +1,4 @@ -depends = OpenGLCommon posix +depends = OpenGLCommon darwin posix language = Objective-C package = platform.OpenGL headers = OpenGL/glu.h diff --git a/platformLibs/src/platform/osx/OpenGL3.def b/platformLibs/src/platform/osx/OpenGL3.def index 9d3b0480777..1d3ba67ea8d 100644 --- a/platformLibs/src/platform/osx/OpenGL3.def +++ b/platformLibs/src/platform/osx/OpenGL3.def @@ -1,4 +1,4 @@ -depends = OpenGLCommon posix +depends = OpenGLCommon darwin posix language = Objective-C package = platform.OpenGL3 headers = OpenGL/gl3.h OpenGL/gl3ext.h diff --git a/platformLibs/src/platform/osx/darwin.def b/platformLibs/src/platform/osx/darwin.def index 929c592e341..b86508870fd 100644 --- a/platformLibs/src/platform/osx/darwin.def +++ b/platformLibs/src/platform/osx/darwin.def @@ -24,11 +24,13 @@ headers = AppleTextureEncoder.h AssertMacros.h Availability.h AvailabilityIntern bank/bank_types.h \ bsm/libbsm.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 + os/log.h os/object.h os/overflow.h os/trace.h \ + simd/simd.h headerFilter = ** +excludedFunctions = __tg_promote + compilerOpts = -D_XOPEN_SOURCE linkerOpts = -ldl -lz diff --git a/platformLibs/src/platform/osx/posix.def b/platformLibs/src/platform/osx/posix.def index d6cd40bada4..a30efc31ab6 100644 --- a/platformLibs/src/platform/osx/posix.def +++ b/platformLibs/src/platform/osx/posix.def @@ -62,4 +62,4 @@ static int init_sockets() { } static void deinit_sockets() { -} \ No newline at end of file +} diff --git a/platformLibs/src/platform/osx/set_depends.sh b/platformLibs/src/platform/osx/set_depends.sh new file mode 100755 index 00000000000..4e6c366dfd1 --- /dev/null +++ b/platformLibs/src/platform/osx/set_depends.sh @@ -0,0 +1,2 @@ +#!/bin/bash +../../../../dist/bin/run_konan defFileDependencies -target macos_x64 *.def diff --git a/platformLibs/src/platform/osx/zlib.def b/platformLibs/src/platform/osx/zlib.def index 69ee2779d23..8292dd723fa 100644 --- a/platformLibs/src/platform/osx/zlib.def +++ b/platformLibs/src/platform/osx/zlib.def @@ -1,7 +1,7 @@ depends = posix package = platform.zlib headers = zconf.h zlib.h -headerFilter = zlib.h +headerFilter = zconf.h zlib.h compilerOpts = -DByte=uByte -DBytef=uBytef linkerOpts = -lz