diff --git a/depot_tools b/depot_tools index 8dd81ea20..9d2c7a3d9 160000 --- a/depot_tools +++ b/depot_tools @@ -1 +1 @@ -Subproject commit 8dd81ea20b3830a816be88d73e61db2097716548 +Subproject commit 9d2c7a3d9ab7c0694b1cbd6ffc519618b92330ed diff --git a/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj b/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj index 1298747f1..0c6e8efcc 100644 --- a/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj @@ -41,6 +41,10 @@ 3454C3491D011F78008A8A1A /* libskia_opts_ssse3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21FD2D231C015ED70023CFAE /* libskia_opts_ssse3.a */; }; 3454C34A1D011F78008A8A1A /* libskia_pdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3454C3191D011F3F008A8A1A /* libskia_pdf.a */; }; 3454C4421D01225F008A8A1A /* libwebp_dsp_neon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197A71C61883C00B41B54 /* libwebp_dsp_neon.a */; }; + 345D70711D1AAEFB005BBE1D /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BEEE561D1AAC20002A1E48 /* libzlib.a */; }; + 34BEEE411D1AAC20002A1E48 /* libraw_codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BEEE401D1AAC20002A1E48 /* libraw_codec.a */; }; + 34BEEE6D1D1AACA0002A1E48 /* libdng_sdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BEEE631D1AAC73002A1E48 /* libdng_sdk.a */; }; + 34BEEE6E1D1AACA0002A1E48 /* libpiex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BEEE681D1AAC73002A1E48 /* libpiex.a */; }; 34F197AE1C61885000B41B54 /* libwebp_dec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197A11C61883C00B41B54 /* libwebp_dec.a */; }; 34F197AF1C61885000B41B54 /* libwebp_demux.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197A31C61883C00B41B54 /* libwebp_demux.a */; }; 34F197B01C61885000B41B54 /* libwebp_dsp_enc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197A91C61883C00B41B54 /* libwebp_dsp_enc.a */; }; @@ -48,7 +52,6 @@ 34F197B21C61885000B41B54 /* libwebp_enc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197AB1C61883C00B41B54 /* libwebp_enc.a */; }; 34F197B31C61885000B41B54 /* libwebp_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197AD1C61883C00B41B54 /* libwebp_utils.a */; }; 34F197B41C61885A00B41B54 /* libjpeg-turbo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197961C61883C00B41B54 /* libjpeg-turbo.a */; }; - 34FEFE431D0132B5002A83B6 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE421D0132B5002A83B6 /* libz.tbd */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -206,20 +209,6 @@ remoteGlobalIDString = F7809684C4703FEA247919D7; remoteInfo = libpng_static; }; - 3454C3331D011F5F008A8A1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3454C31D1D011F5F008A8A1A /* libpng.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E39C49F89C198F5DCCBEC9D6; - remoteInfo = libpng_static_neon; - }; - 3454C33C1D011F5F008A8A1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = AB2A2848CDD879230450649F; - remoteInfo = zlib_x86_simd; - }; 3454C3AC1D012002008A8A1A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */; @@ -584,6 +573,62 @@ remoteGlobalIDString = 1B6986FB36482648B3A1881E; remoteInfo = libwebp_dsp_neon; }; + 345D70721D1AAF43005BBE1D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = CFE557433A4D2EFFDC01DBB4; + remoteInfo = zlib; + }; + 34BEEE3F1D1AAC20002A1E48 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C22F56FFE9D836FB998E42FD; + remoteInfo = raw_codec; + }; + 34BEEE551D1AAC20002A1E48 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 71C051910E94E0D5C79129A5; + remoteInfo = zlib; + }; + 34BEEE571D1AAC45002A1E48 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FE981E92663D0162AD2B491E; + remoteInfo = raw_codec; + }; + 34BEEE621D1AAC73002A1E48 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 34BEEE591D1AAC73002A1E48 /* dng_sdk.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C4AD63FA59E89780AF2A1120; + remoteInfo = dng_sdk; + }; + 34BEEE671D1AAC73002A1E48 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 34BEEE5C1D1AAC73002A1E48 /* piex.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 5D5D10DDD87719BE19D91CC3; + remoteInfo = piex; + }; + 34BEEE691D1AAC82002A1E48 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 34BEEE591D1AAC73002A1E48 /* dng_sdk.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = DB539CB19E80F8ADB38ABB89; + remoteInfo = dng_sdk; + }; + 34BEEE6B1D1AAC82002A1E48 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 34BEEE5C1D1AAC73002A1E48 /* piex.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 2DCF672F726600FFFAE0A889; + remoteInfo = piex; + }; 34F197931C61883C00B41B54 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 34F197881C61883C00B41B54 /* libjpeg-turbo.xcodeproj */; @@ -683,10 +728,11 @@ 3454C31D1D011F5F008A8A1A /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../skia/out/gyp/libpng.xcodeproj; sourceTree = ""; }; 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../skia/out/gyp/zlib.xcodeproj; sourceTree = ""; }; 3454C3231D011F5F008A8A1A /* giflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = giflib.xcodeproj; path = ../../skia/out/gyp/giflib.xcodeproj; sourceTree = ""; }; + 34BEEE591D1AAC73002A1E48 /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../skia/out/gyp/dng_sdk.xcodeproj; sourceTree = ""; }; + 34BEEE5C1D1AAC73002A1E48 /* piex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = piex.xcodeproj; path = ../../skia/out/gyp/piex.xcodeproj; sourceTree = ""; }; 34F197851C61883C00B41B54 /* libjpeg-turbo-selector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo-selector.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo-selector.xcodeproj"; sourceTree = ""; }; 34F197881C61883C00B41B54 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = ""; }; 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../skia/out/gyp/libwebp.xcodeproj; sourceTree = ""; }; - 34FEFE421D0132B5002A83B6 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -694,7 +740,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 34FEFE431D0132B5002A83B6 /* libz.tbd in Frameworks */, + 345D70711D1AAEFB005BBE1D /* libzlib.a in Frameworks */, + 34BEEE6D1D1AACA0002A1E48 /* libdng_sdk.a in Frameworks */, + 34BEEE6E1D1AACA0002A1E48 /* libpiex.a in Frameworks */, + 34BEEE411D1AAC20002A1E48 /* libraw_codec.a in Frameworks */, 3454C4421D01225F008A8A1A /* libwebp_dsp_neon.a in Frameworks */, 3454C33E1D011F78008A8A1A /* libgiflib.a in Frameworks */, 3454C3411D011F78008A8A1A /* libpng_static.a in Frameworks */, @@ -737,7 +786,6 @@ 21FD2B261C014C000023CFAE = { isa = PBXGroup; children = ( - 34FEFE421D0132B5002A83B6 /* libz.tbd */, 21FD2D411C015F780023CFAE /* libc++.tbd */, 21FD2B3B1C014C110023CFAE /* skia_libs */, 21FD2B321C014C000023CFAE /* Source */, @@ -773,6 +821,8 @@ 21FD2B3B1C014C110023CFAE /* skia_libs */ = { isa = PBXGroup; children = ( + 34BEEE591D1AAC73002A1E48 /* dng_sdk.xcodeproj */, + 34BEEE5C1D1AAC73002A1E48 /* piex.xcodeproj */, 3454C31A1D011F5F008A8A1A /* skia_lib.xcodeproj */, 3454C31D1D011F5F008A8A1A /* libpng.xcodeproj */, 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */, @@ -814,6 +864,7 @@ isa = PBXGroup; children = ( 21FD2D081C015ED70023CFAE /* libskia_codec.a */, + 34BEEE401D1AAC20002A1E48 /* libraw_codec.a */, ); name = Products; sourceTree = ""; @@ -924,7 +975,6 @@ isa = PBXGroup; children = ( 3454C3321D011F5F008A8A1A /* libpng_static.a */, - 3454C3341D011F5F008A8A1A /* libpng_static_neon.a */, ); name = Products; sourceTree = ""; @@ -932,7 +982,7 @@ 3454C3211D011F5F008A8A1A /* Products */ = { isa = PBXGroup; children = ( - 3454C33D1D011F5F008A8A1A /* libzlib_x86_simd.a */, + 34BEEE561D1AAC20002A1E48 /* libzlib.a */, ); name = Products; sourceTree = ""; @@ -945,6 +995,22 @@ name = Products; sourceTree = ""; }; + 34BEEE5A1D1AAC73002A1E48 /* Products */ = { + isa = PBXGroup; + children = ( + 34BEEE631D1AAC73002A1E48 /* libdng_sdk.a */, + ); + name = Products; + sourceTree = ""; + }; + 34BEEE5D1D1AAC73002A1E48 /* Products */ = { + isa = PBXGroup; + children = ( + 34BEEE681D1AAC73002A1E48 /* libpiex.a */, + ); + name = Products; + sourceTree = ""; + }; 34F197861C61883C00B41B54 /* Products */ = { isa = PBXGroup; children = ( @@ -1004,6 +1070,10 @@ buildRules = ( ); dependencies = ( + 345D70731D1AAF43005BBE1D /* PBXTargetDependency */, + 34BEEE6A1D1AAC82002A1E48 /* PBXTargetDependency */, + 34BEEE6C1D1AAC82002A1E48 /* PBXTargetDependency */, + 34BEEE581D1AAC45002A1E48 /* PBXTargetDependency */, 3454C4411D012257008A8A1A /* PBXTargetDependency */, 3454C3AD1D012002008A8A1A /* PBXTargetDependency */, 3454C3B11D012002008A8A1A /* PBXTargetDependency */, @@ -1099,6 +1169,10 @@ ProductGroup = 21FD2CED1C015ED60023CFAE /* Products */; ProjectRef = 21FD2CEC1C015ED60023CFAE /* core.xcodeproj */; }, + { + ProductGroup = 34BEEE5A1D1AAC73002A1E48 /* Products */; + ProjectRef = 34BEEE591D1AAC73002A1E48 /* dng_sdk.xcodeproj */; + }, { ProductGroup = 21FD2CF01C015ED60023CFAE /* Products */; ProjectRef = 21FD2CEF1C015ED60023CFAE /* effects.xcodeproj */; @@ -1147,6 +1221,10 @@ ProductGroup = 3454C2F11D011F3F008A8A1A /* Products */; ProjectRef = 3454C2F01D011F3F008A8A1A /* pdf.xcodeproj */; }, + { + ProductGroup = 34BEEE5D1D1AAC73002A1E48 /* Products */; + ProjectRef = 34BEEE5C1D1AAC73002A1E48 /* piex.xcodeproj */; + }, { ProductGroup = 21FD2CFE1C015ED60023CFAE /* Products */; ProjectRef = 21FD2CFD1C015ED60023CFAE /* ports.xcodeproj */; @@ -1330,18 +1408,32 @@ remoteRef = 3454C3311D011F5F008A8A1A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 3454C3341D011F5F008A8A1A /* libpng_static_neon.a */ = { + 34BEEE401D1AAC20002A1E48 /* libraw_codec.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libpng_static_neon.a; - remoteRef = 3454C3331D011F5F008A8A1A /* PBXContainerItemProxy */; + path = libraw_codec.a; + remoteRef = 34BEEE3F1D1AAC20002A1E48 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 3454C33D1D011F5F008A8A1A /* libzlib_x86_simd.a */ = { + 34BEEE561D1AAC20002A1E48 /* libzlib.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libzlib_x86_simd.a; - remoteRef = 3454C33C1D011F5F008A8A1A /* PBXContainerItemProxy */; + path = libzlib.a; + remoteRef = 34BEEE551D1AAC20002A1E48 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 34BEEE631D1AAC73002A1E48 /* libdng_sdk.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libdng_sdk.a; + remoteRef = 34BEEE621D1AAC73002A1E48 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 34BEEE681D1AAC73002A1E48 /* libpiex.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libpiex.a; + remoteRef = 34BEEE671D1AAC73002A1E48 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 34F197941C61883C00B41B54 /* yasm-win */ = { @@ -1694,6 +1786,26 @@ name = libwebp_dsp_neon; targetProxy = 3454C4401D012257008A8A1A /* PBXContainerItemProxy */; }; + 345D70731D1AAF43005BBE1D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = zlib; + targetProxy = 345D70721D1AAF43005BBE1D /* PBXContainerItemProxy */; + }; + 34BEEE581D1AAC45002A1E48 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = raw_codec; + targetProxy = 34BEEE571D1AAC45002A1E48 /* PBXContainerItemProxy */; + }; + 34BEEE6A1D1AAC82002A1E48 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = dng_sdk; + targetProxy = 34BEEE691D1AAC82002A1E48 /* PBXContainerItemProxy */; + }; + 34BEEE6C1D1AAC82002A1E48 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = piex; + targetProxy = 34BEEE6B1D1AAC82002A1E48 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ diff --git a/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj b/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj index f6669ee31..0590263de 100644 --- a/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj @@ -40,14 +40,17 @@ 342959F61C6173F900BF1BB6 /* libwebp_enc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342959E91C61737400BF1BB6 /* libwebp_enc.a */; }; 342959F71C6173F900BF1BB6 /* libwebp_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342959EB1C61737400BF1BB6 /* libwebp_utils.a */; }; 343DAE301C3F26CF00FAD826 /* SkiaKeeper.c in Sources */ = {isa = PBXBuildFile; fileRef = 343DAE2E1C3F26CF00FAD826 /* SkiaKeeper.c */; }; + 344B478A1D1ADD7400EFE6F9 /* libsfntly.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 344B47861D1ADD6A00EFE6F9 /* libsfntly.a */; }; 3460AD3E1D0157F10051FEA0 /* libskia_codec_android.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE951D015718002A83B6 /* libskia_codec_android.a */; }; 3460AD3F1D0157F10051FEA0 /* libskia_codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE921D015718002A83B6 /* libskia_codec.a */; }; 3460AD401D0157F10051FEA0 /* libskia_pdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFEB91D015718002A83B6 /* libskia_pdf.a */; }; 3460AD781D0158370051FEA0 /* libgiflib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE981D015718002A83B6 /* libgiflib.a */; }; 3460AD791D0158370051FEA0 /* libpng_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFEA51D015718002A83B6 /* libpng_static.a */; }; + 3488AE1A1D1ADC7E00BE2DC3 /* libdng_sdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3488AE091D1ADC3F00BE2DC3 /* libdng_sdk.a */; }; + 3488AE1B1D1ADC7E00BE2DC3 /* libpiex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3488AE0E1D1ADC3F00BE2DC3 /* libpiex.a */; }; + 3488AE1C1D1ADC7E00BE2DC3 /* libraw_codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3488ADEB1D1ADC1000BE2DC3 /* libraw_codec.a */; }; + 3488AE1D1D1ADC7E00BE2DC3 /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3488AE111D1ADC3F00BE2DC3 /* libzlib.a */; }; 34FEFECE1D01572D002A83B6 /* libicuuc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE9B1D015718002A83B6 /* libicuuc.a */; }; - 34FEFECF1D01572D002A83B6 /* libsfntly.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFEBC1D015718002A83B6 /* libsfntly.a */; }; - 34FEFED11D015733002A83B6 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFED01D015733002A83B6 /* libz.tbd */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -310,20 +313,6 @@ remoteGlobalIDString = 19B76369DDF015E4A37C4F1D; remoteInfo = libwebp_utils; }; - 342959EC1C6173DE00BF1BB6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 48175D1FF8639EC962F81D8E; - remoteInfo = libwebp; - }; - 342959EE1C6173E400BF1BB6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 342959891C616FA000BF1BB6 /* libjpeg-turbo-selector.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 77F3E5FCA3C0CD28BE14BF52; - remoteInfo = "libjpeg-turbo-selector"; - }; 342959F01C6173E900BF1BB6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */; @@ -331,61 +320,19 @@ remoteGlobalIDString = 43AF69108FDDD0AB4332A1ED; remoteInfo = libwebp_dsp_enc; }; - 34295A071C61748B00BF1BB6 /* PBXContainerItemProxy */ = { + 344B47851D1ADD6A00EFE6F9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */; + containerPortal = 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 1CD3105B0CC6850951ACB14C; - remoteInfo = yasm; + remoteGlobalIDString = 70CCA63D0A9AF8CD04A019F9; + remoteInfo = sfntly; }; - 34295A091C61748B00BF1BB6 /* PBXContainerItemProxy */ = { + 344B47881D1ADD6F00EFE6F9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 409E99D7C44751B2B82733E8; - remoteInfo = genperf_libs; - }; - 34295A0B1C61748B00BF1BB6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D0186125C0873AF692668790; - remoteInfo = genstring; - }; - 34295A0D1C61748B00BF1BB6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 9E47A5965BD0DCF7DB42B8FC; - remoteInfo = genperf; - }; - 34295A0F1C61748B00BF1BB6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 9DB2EAA39B6DA45B284428F1; - remoteInfo = genmacro; - }; - 34295A111C61748B00BF1BB6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D3015B86C15A40ADD0F626C4; - remoteInfo = genversion; - }; - 34295A131C61748B00BF1BB6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0AA7991A727CAC4C9F3E7817; - remoteInfo = re2c; - }; - 34295A151C61748B00BF1BB6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4BE5C0FF1EE57DDD7E318BD3; - remoteInfo = genmodule; + containerPortal = 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 94EC2B00B9A5217A42B1C7D4; + remoteInfo = sfntly; }; 3460AD621D0158270051FEA0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -464,6 +411,62 @@ remoteGlobalIDString = C37161A72930D0F121229C3F; remoteInfo = pdf; }; + 3488ADEA1D1ADC1000BE2DC3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C22F56FFE9D836FB998E42FD; + remoteInfo = raw_codec; + }; + 3488AE081D1ADC3F00BE2DC3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3488ADFC1D1ADC3F00BE2DC3 /* dng_sdk.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C4AD63FA59E89780AF2A1120; + remoteInfo = dng_sdk; + }; + 3488AE0D1D1ADC3F00BE2DC3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3488ADFF1D1ADC3F00BE2DC3 /* piex.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 5D5D10DDD87719BE19D91CC3; + remoteInfo = piex; + }; + 3488AE101D1ADC3F00BE2DC3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3488AE021D1ADC3F00BE2DC3 /* zlib.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 71C051910E94E0D5C79129A5; + remoteInfo = zlib; + }; + 3488AE121D1ADC6400BE2DC3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3488ADFC1D1ADC3F00BE2DC3 /* dng_sdk.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = DB539CB19E80F8ADB38ABB89; + remoteInfo = dng_sdk; + }; + 3488AE141D1ADC6400BE2DC3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3488ADFF1D1ADC3F00BE2DC3 /* piex.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 2DCF672F726600FFFAE0A889; + remoteInfo = piex; + }; + 3488AE161D1ADC6400BE2DC3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3488AE021D1ADC3F00BE2DC3 /* zlib.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = CFE557433A4D2EFFDC01DBB4; + remoteInfo = zlib; + }; + 3488AE181D1ADC6400BE2DC3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FE981E92663D0162AD2B491E; + remoteInfo = raw_codec; + }; 34FEFE911D015718002A83B6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */; @@ -499,13 +502,6 @@ remoteGlobalIDString = F7809684C4703FEA247919D7; remoteInfo = libpng_static; }; - 34FEFEA61D015718002A83B6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34FEFE841D015718002A83B6 /* libpng.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E39C49F89C198F5DCCBEC9D6; - remoteInfo = libpng_static_neon; - }; 34FEFEB61D015718002A83B6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 34FEFE871D015718002A83B6 /* pdf.xcodeproj */; @@ -520,13 +516,6 @@ remoteGlobalIDString = 0DC15EA4ADE06EC812B0409E; remoteInfo = pdf; }; - 34FEFEBB1D015718002A83B6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 70CCA63D0A9AF8CD04A019F9; - remoteInfo = sfntly; - }; 34FEFECA1D015725002A83B6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 34FEFE811D015718002A83B6 /* icu.xcodeproj */; @@ -534,13 +523,6 @@ remoteGlobalIDString = A8365F341FF32481B097DC30; remoteInfo = icuuc; }; - 34FEFECC1D015725002A83B6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 94EC2B00B9A5217A42B1C7D4; - remoteInfo = sfntly; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -570,17 +552,18 @@ 342959891C616FA000BF1BB6 /* libjpeg-turbo-selector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo-selector.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo-selector.xcodeproj"; sourceTree = ""; }; 3429598C1C616FA000BF1BB6 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = ""; }; 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../skia/out/gyp/libwebp.xcodeproj; sourceTree = ""; }; - 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = yasm.xcodeproj; path = ../../skia/out/gyp/yasm.xcodeproj; sourceTree = ""; }; 343DAE2E1C3F26CF00FAD826 /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../src/SkiaKeeper.c; sourceTree = ""; }; + 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfntly.xcodeproj; path = ../../skia/out/gyp/sfntly.xcodeproj; sourceTree = ""; }; + 3488ADFC1D1ADC3F00BE2DC3 /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../skia/out/gyp/dng_sdk.xcodeproj; sourceTree = ""; }; + 3488ADFF1D1ADC3F00BE2DC3 /* piex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = piex.xcodeproj; path = ../../skia/out/gyp/piex.xcodeproj; sourceTree = ""; }; + 3488AE021D1ADC3F00BE2DC3 /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../skia/out/gyp/zlib.xcodeproj; sourceTree = ""; }; 34FEFE781D015718002A83B6 /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../skia/out/gyp/codec_android.xcodeproj; sourceTree = ""; }; 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../skia/out/gyp/codec.xcodeproj; sourceTree = ""; }; 34FEFE7E1D015718002A83B6 /* giflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = giflib.xcodeproj; path = ../../skia/out/gyp/giflib.xcodeproj; sourceTree = ""; }; 34FEFE811D015718002A83B6 /* icu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = icu.xcodeproj; path = ../../skia/out/gyp/icu.xcodeproj; sourceTree = ""; }; 34FEFE841D015718002A83B6 /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../skia/out/gyp/libpng.xcodeproj; sourceTree = ""; }; 34FEFE871D015718002A83B6 /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../skia/out/gyp/pdf.xcodeproj; sourceTree = ""; }; - 34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfntly.xcodeproj; path = ../../skia/out/gyp/sfntly.xcodeproj; sourceTree = ""; }; 34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../skia/out/gyp/skia_lib.xcodeproj; sourceTree = ""; }; - 34FEFED01D015733002A83B6 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -588,14 +571,17 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 344B478A1D1ADD7400EFE6F9 /* libsfntly.a in Frameworks */, + 3488AE1A1D1ADC7E00BE2DC3 /* libdng_sdk.a in Frameworks */, + 3488AE1B1D1ADC7E00BE2DC3 /* libpiex.a in Frameworks */, + 3488AE1C1D1ADC7E00BE2DC3 /* libraw_codec.a in Frameworks */, + 3488AE1D1D1ADC7E00BE2DC3 /* libzlib.a in Frameworks */, 3460AD781D0158370051FEA0 /* libgiflib.a in Frameworks */, 3460AD791D0158370051FEA0 /* libpng_static.a in Frameworks */, 3460AD3E1D0157F10051FEA0 /* libskia_codec_android.a in Frameworks */, 3460AD3F1D0157F10051FEA0 /* libskia_codec.a in Frameworks */, 3460AD401D0157F10051FEA0 /* libskia_pdf.a in Frameworks */, - 34FEFED11D015733002A83B6 /* libz.tbd in Frameworks */, 34FEFECE1D01572D002A83B6 /* libicuuc.a in Frameworks */, - 34FEFECF1D01572D002A83B6 /* libsfntly.a in Frameworks */, 342959F21C6173F900BF1BB6 /* libwebp_dec.a in Frameworks */, 342959F31C6173F900BF1BB6 /* libwebp_demux.a in Frameworks */, 342959F41C6173F900BF1BB6 /* libwebp_dsp_enc.a in Frameworks */, @@ -631,7 +617,6 @@ 21C9514C1C03D27A003A1E1D = { isa = PBXGroup; children = ( - 34FEFED01D015733002A83B6 /* libz.tbd */, 343DAE2D1C3F26BF00FAD826 /* Source */, 21C951651C03D2E3003A1E1D /* skia_libs */, 21C951561C03D27A003A1E1D /* Products */, @@ -649,15 +634,17 @@ 21C951651C03D2E3003A1E1D /* skia_libs */ = { isa = PBXGroup; children = ( + 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */, + 3488ADFC1D1ADC3F00BE2DC3 /* dng_sdk.xcodeproj */, + 3488ADFF1D1ADC3F00BE2DC3 /* piex.xcodeproj */, + 3488AE021D1ADC3F00BE2DC3 /* zlib.xcodeproj */, 34FEFE781D015718002A83B6 /* codec_android.xcodeproj */, 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */, 34FEFE7E1D015718002A83B6 /* giflib.xcodeproj */, 34FEFE811D015718002A83B6 /* icu.xcodeproj */, 34FEFE841D015718002A83B6 /* libpng.xcodeproj */, 34FEFE871D015718002A83B6 /* pdf.xcodeproj */, - 34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */, 34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */, - 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */, 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */, 342959891C616FA000BF1BB6 /* libjpeg-turbo-selector.xcodeproj */, 3429598C1C616FA000BF1BB6 /* libjpeg-turbo.xcodeproj */, @@ -796,21 +783,6 @@ name = Products; sourceTree = ""; }; - 342959F91C61748A00BF1BB6 /* Products */ = { - isa = PBXGroup; - children = ( - 34295A081C61748B00BF1BB6 /* yasm */, - 34295A0A1C61748B00BF1BB6 /* libgenperf_libs.a */, - 34295A0C1C61748B00BF1BB6 /* genstring */, - 34295A0E1C61748B00BF1BB6 /* genperf */, - 34295A101C61748B00BF1BB6 /* genmacro */, - 34295A121C61748B00BF1BB6 /* genversion */, - 34295A141C61748B00BF1BB6 /* re2c */, - 34295A161C61748B00BF1BB6 /* genmodule */, - ); - name = Products; - sourceTree = ""; - }; 343DAE2D1C3F26BF00FAD826 /* Source */ = { isa = PBXGroup; children = ( @@ -825,6 +797,38 @@ name = Source; sourceTree = ""; }; + 344B476E1D1ADD6A00EFE6F9 /* Products */ = { + isa = PBXGroup; + children = ( + 344B47861D1ADD6A00EFE6F9 /* libsfntly.a */, + ); + name = Products; + sourceTree = ""; + }; + 3488ADFD1D1ADC3F00BE2DC3 /* Products */ = { + isa = PBXGroup; + children = ( + 3488AE091D1ADC3F00BE2DC3 /* libdng_sdk.a */, + ); + name = Products; + sourceTree = ""; + }; + 3488AE001D1ADC3F00BE2DC3 /* Products */ = { + isa = PBXGroup; + children = ( + 3488AE0E1D1ADC3F00BE2DC3 /* libpiex.a */, + ); + name = Products; + sourceTree = ""; + }; + 3488AE031D1ADC3F00BE2DC3 /* Products */ = { + isa = PBXGroup; + children = ( + 3488AE111D1ADC3F00BE2DC3 /* libzlib.a */, + ); + name = Products; + sourceTree = ""; + }; 34FEFE791D015718002A83B6 /* Products */ = { isa = PBXGroup; children = ( @@ -837,6 +841,7 @@ isa = PBXGroup; children = ( 34FEFE921D015718002A83B6 /* libskia_codec.a */, + 3488ADEB1D1ADC1000BE2DC3 /* libraw_codec.a */, ); name = Products; sourceTree = ""; @@ -861,7 +866,6 @@ isa = PBXGroup; children = ( 34FEFEA51D015718002A83B6 /* libpng_static.a */, - 34FEFEA71D015718002A83B6 /* libpng_static_neon.a */, ); name = Products; sourceTree = ""; @@ -875,14 +879,6 @@ name = Products; sourceTree = ""; }; - 34FEFE8B1D015718002A83B6 /* Products */ = { - isa = PBXGroup; - children = ( - 34FEFEBC1D015718002A83B6 /* libsfntly.a */, - ); - name = Products; - sourceTree = ""; - }; 34FEFE8E1D015718002A83B6 /* Products */ = { isa = PBXGroup; children = ( @@ -917,6 +913,11 @@ buildRules = ( ); dependencies = ( + 344B47891D1ADD6F00EFE6F9 /* PBXTargetDependency */, + 3488AE131D1ADC6400BE2DC3 /* PBXTargetDependency */, + 3488AE151D1ADC6400BE2DC3 /* PBXTargetDependency */, + 3488AE171D1ADC6400BE2DC3 /* PBXTargetDependency */, + 3488AE191D1ADC6400BE2DC3 /* PBXTargetDependency */, 3460AD631D0158270051FEA0 /* PBXTargetDependency */, 3460AD651D0158270051FEA0 /* PBXTargetDependency */, 3460AD671D0158270051FEA0 /* PBXTargetDependency */, @@ -929,10 +930,7 @@ 3460AD751D0158270051FEA0 /* PBXTargetDependency */, 3460AD771D0158270051FEA0 /* PBXTargetDependency */, 34FEFECB1D015725002A83B6 /* PBXTargetDependency */, - 34FEFECD1D015725002A83B6 /* PBXTargetDependency */, 342959F11C6173E900BF1BB6 /* PBXTargetDependency */, - 342959EF1C6173E400BF1BB6 /* PBXTargetDependency */, - 342959ED1C6173DE00BF1BB6 /* PBXTargetDependency */, 21C951F41C03D557003A1E1D /* PBXTargetDependency */, 21C951EB1C03D532003A1E1D /* PBXTargetDependency */, 21C951DE1C03D4FF003A1E1D /* PBXTargetDependency */, @@ -989,6 +987,10 @@ ProductGroup = 21C9516D1C03D36D003A1E1D /* Products */; ProjectRef = 21C9516C1C03D36D003A1E1D /* core.xcodeproj */; }, + { + ProductGroup = 3488ADFD1D1ADC3F00BE2DC3 /* Products */; + ProjectRef = 3488ADFC1D1ADC3F00BE2DC3 /* dng_sdk.xcodeproj */; + }, { ProductGroup = 21C951791C03D380003A1E1D /* Products */; ProjectRef = 21C951781C03D380003A1E1D /* effects.xcodeproj */; @@ -1041,6 +1043,10 @@ ProductGroup = 34FEFE881D015718002A83B6 /* Products */; ProjectRef = 34FEFE871D015718002A83B6 /* pdf.xcodeproj */; }, + { + ProductGroup = 3488AE001D1ADC3F00BE2DC3 /* Products */; + ProjectRef = 3488ADFF1D1ADC3F00BE2DC3 /* piex.xcodeproj */; + }, { ProductGroup = 21C951CF1C03D4B8003A1E1D /* Products */; ProjectRef = 21C951CE1C03D4B8003A1E1D /* ports.xcodeproj */; @@ -1050,8 +1056,8 @@ ProjectRef = 21C951661C03D363003A1E1D /* sfnt.xcodeproj */; }, { - ProductGroup = 34FEFE8B1D015718002A83B6 /* Products */; - ProjectRef = 34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */; + ProductGroup = 344B476E1D1ADD6A00EFE6F9 /* Products */; + ProjectRef = 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */; }, { ProductGroup = 34FEFE8E1D015718002A83B6 /* Products */; @@ -1062,8 +1068,8 @@ ProjectRef = 21C951E01C03D528003A1E1D /* utils.xcodeproj */; }, { - ProductGroup = 342959F91C61748A00BF1BB6 /* Products */; - ProjectRef = 342959F81C61748A00BF1BB6 /* yasm.xcodeproj */; + ProductGroup = 3488AE031D1ADC3F00BE2DC3 /* Products */; + ProjectRef = 3488AE021D1ADC3F00BE2DC3 /* zlib.xcodeproj */; }, ); projectRoot = ""; @@ -1242,60 +1248,39 @@ remoteRef = 342959EA1C61737400BF1BB6 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34295A081C61748B00BF1BB6 /* yasm */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = yasm; - remoteRef = 34295A071C61748B00BF1BB6 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34295A0A1C61748B00BF1BB6 /* libgenperf_libs.a */ = { + 344B47861D1ADD6A00EFE6F9 /* libsfntly.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libgenperf_libs.a; - remoteRef = 34295A091C61748B00BF1BB6 /* PBXContainerItemProxy */; + path = libsfntly.a; + remoteRef = 344B47851D1ADD6A00EFE6F9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34295A0C1C61748B00BF1BB6 /* genstring */ = { + 3488ADEB1D1ADC1000BE2DC3 /* libraw_codec.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = genstring; - remoteRef = 34295A0B1C61748B00BF1BB6 /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libraw_codec.a; + remoteRef = 3488ADEA1D1ADC1000BE2DC3 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34295A0E1C61748B00BF1BB6 /* genperf */ = { + 3488AE091D1ADC3F00BE2DC3 /* libdng_sdk.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = genperf; - remoteRef = 34295A0D1C61748B00BF1BB6 /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libdng_sdk.a; + remoteRef = 3488AE081D1ADC3F00BE2DC3 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34295A101C61748B00BF1BB6 /* genmacro */ = { + 3488AE0E1D1ADC3F00BE2DC3 /* libpiex.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = genmacro; - remoteRef = 34295A0F1C61748B00BF1BB6 /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libpiex.a; + remoteRef = 3488AE0D1D1ADC3F00BE2DC3 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34295A121C61748B00BF1BB6 /* genversion */ = { + 3488AE111D1ADC3F00BE2DC3 /* libzlib.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = genversion; - remoteRef = 34295A111C61748B00BF1BB6 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34295A141C61748B00BF1BB6 /* re2c */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = re2c; - remoteRef = 34295A131C61748B00BF1BB6 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34295A161C61748B00BF1BB6 /* genmodule */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = genmodule; - remoteRef = 34295A151C61748B00BF1BB6 /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libzlib.a; + remoteRef = 3488AE101D1ADC3F00BE2DC3 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 34FEFE921D015718002A83B6 /* libskia_codec.a */ = { @@ -1333,13 +1318,6 @@ remoteRef = 34FEFEA41D015718002A83B6 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34FEFEA71D015718002A83B6 /* libpng_static_neon.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libpng_static_neon.a; - remoteRef = 34FEFEA61D015718002A83B6 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 34FEFEB71D015718002A83B6 /* libnopdf.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1354,13 +1332,6 @@ remoteRef = 34FEFEB81D015718002A83B6 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34FEFEBC1D015718002A83B6 /* libsfntly.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libsfntly.a; - remoteRef = 34FEFEBB1D015718002A83B6 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXSourcesBuildPhase section */ @@ -1443,21 +1414,16 @@ name = libetc1; targetProxy = 21C951F31C03D557003A1E1D /* PBXContainerItemProxy */; }; - 342959ED1C6173DE00BF1BB6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = libwebp; - targetProxy = 342959EC1C6173DE00BF1BB6 /* PBXContainerItemProxy */; - }; - 342959EF1C6173E400BF1BB6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libjpeg-turbo-selector"; - targetProxy = 342959EE1C6173E400BF1BB6 /* PBXContainerItemProxy */; - }; 342959F11C6173E900BF1BB6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = libwebp_dsp_enc; targetProxy = 342959F01C6173E900BF1BB6 /* PBXContainerItemProxy */; }; + 344B47891D1ADD6F00EFE6F9 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = sfntly; + targetProxy = 344B47881D1ADD6F00EFE6F9 /* PBXContainerItemProxy */; + }; 3460AD631D0158270051FEA0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = codec_android; @@ -1513,16 +1479,31 @@ name = pdf; targetProxy = 3460AD761D0158270051FEA0 /* PBXContainerItemProxy */; }; + 3488AE131D1ADC6400BE2DC3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = dng_sdk; + targetProxy = 3488AE121D1ADC6400BE2DC3 /* PBXContainerItemProxy */; + }; + 3488AE151D1ADC6400BE2DC3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = piex; + targetProxy = 3488AE141D1ADC6400BE2DC3 /* PBXContainerItemProxy */; + }; + 3488AE171D1ADC6400BE2DC3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = zlib; + targetProxy = 3488AE161D1ADC6400BE2DC3 /* PBXContainerItemProxy */; + }; + 3488AE191D1ADC6400BE2DC3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = raw_codec; + targetProxy = 3488AE181D1ADC6400BE2DC3 /* PBXContainerItemProxy */; + }; 34FEFECB1D015725002A83B6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = icuuc; targetProxy = 34FEFECA1D015725002A83B6 /* PBXContainerItemProxy */; }; - 34FEFECD1D015725002A83B6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = sfntly; - targetProxy = 34FEFECC1D015725002A83B6 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ diff --git a/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj b/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj index c086ae357..fcc0cbba9 100644 --- a/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj @@ -30,6 +30,10 @@ 340303961C4053E500630F26 /* SkManagedStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340303921C4053E500630F26 /* SkManagedStream.cpp */; }; 340303971C4053E500630F26 /* SkManagedStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 340303931C4053E500630F26 /* SkManagedStream.h */; }; 340303DB1C40877300630F26 /* sk_xamarin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340303DA1C40877300630F26 /* sk_xamarin.cpp */; }; + 342BF1911D1ADD2E0072D19E /* libdng_sdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342BF1831D1ADCFD0072D19E /* libdng_sdk.a */; }; + 342BF1921D1ADD2E0072D19E /* libpiex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342BF1881D1ADCFD0072D19E /* libpiex.a */; }; + 342BF1931D1ADD2E0072D19E /* libraw_codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342BF1671D1ADCD90072D19E /* libraw_codec.a */; }; + 342BF1941D1ADD2E0072D19E /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342BF1781D1ADCD90072D19E /* libzlib.a */; }; 343DAE471C3F285700FAD826 /* SkiaKeeper.c in Sources */ = {isa = PBXBuildFile; fileRef = 343DAE451C3F285700FAD826 /* SkiaKeeper.c */; }; 3454C33E1D011F78008A8A1A /* libgiflib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3454C32C1D011F5F008A8A1A /* libgiflib.a */; }; 3454C3411D011F78008A8A1A /* libpng_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3454C3321D011F5F008A8A1A /* libpng_static.a */; }; @@ -40,7 +44,7 @@ 3454C3481D011F78008A8A1A /* libskia_opts_sse42.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21FD2D271C015ED70023CFAE /* libskia_opts_sse42.a */; }; 3454C3491D011F78008A8A1A /* libskia_opts_ssse3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21FD2D231C015ED70023CFAE /* libskia_opts_ssse3.a */; }; 3454C34A1D011F78008A8A1A /* libskia_pdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3454C3191D011F3F008A8A1A /* libskia_pdf.a */; }; - 3454C4421D01225F008A8A1A /* libwebp_dsp_neon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197A71C61883C00B41B54 /* libwebp_dsp_neon.a */; }; + 346F41A81D1ADFA600204DD2 /* libwebp_dsp_neon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 346F41A71D1ADFA600204DD2 /* libwebp_dsp_neon.a */; }; 34F197AE1C61885000B41B54 /* libwebp_dec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197A11C61883C00B41B54 /* libwebp_dec.a */; }; 34F197AF1C61885000B41B54 /* libwebp_demux.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197A31C61883C00B41B54 /* libwebp_demux.a */; }; 34F197B01C61885000B41B54 /* libwebp_dsp_enc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197A91C61883C00B41B54 /* libwebp_dsp_enc.a */; }; @@ -48,7 +52,6 @@ 34F197B21C61885000B41B54 /* libwebp_enc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197AB1C61883C00B41B54 /* libwebp_enc.a */; }; 34F197B31C61885000B41B54 /* libwebp_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197AD1C61883C00B41B54 /* libwebp_utils.a */; }; 34F197B41C61885A00B41B54 /* libjpeg-turbo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F197961C61883C00B41B54 /* libjpeg-turbo.a */; }; - 34FEFE431D0132B5002A83B6 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE421D0132B5002A83B6 /* libz.tbd */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -178,6 +181,62 @@ remoteGlobalIDString = 58D65910B589341DD97198F8; remoteInfo = libetc1; }; + 342BF1661D1ADCD90072D19E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C22F56FFE9D836FB998E42FD; + remoteInfo = raw_codec; + }; + 342BF1771D1ADCD90072D19E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 71C051910E94E0D5C79129A5; + remoteInfo = zlib; + }; + 342BF1821D1ADCFD0072D19E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 342BF1791D1ADCFD0072D19E /* dng_sdk.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C4AD63FA59E89780AF2A1120; + remoteInfo = dng_sdk; + }; + 342BF1871D1ADCFD0072D19E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 342BF17C1D1ADCFD0072D19E /* piex.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 5D5D10DDD87719BE19D91CC3; + remoteInfo = piex; + }; + 342BF1891D1ADD1D0072D19E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 342BF1791D1ADCFD0072D19E /* dng_sdk.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = DB539CB19E80F8ADB38ABB89; + remoteInfo = dng_sdk; + }; + 342BF18B1D1ADD1D0072D19E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 342BF17C1D1ADCFD0072D19E /* piex.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 2DCF672F726600FFFAE0A889; + remoteInfo = piex; + }; + 342BF18D1D1ADD1D0072D19E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FE981E92663D0162AD2B491E; + remoteInfo = raw_codec; + }; + 342BF18F1D1ADD1D0072D19E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = CFE557433A4D2EFFDC01DBB4; + remoteInfo = zlib; + }; 3454C3161D011F3F008A8A1A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 3454C2F01D011F3F008A8A1A /* pdf.xcodeproj */; @@ -206,20 +265,6 @@ remoteGlobalIDString = F7809684C4703FEA247919D7; remoteInfo = libpng_static; }; - 3454C3331D011F5F008A8A1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3454C31D1D011F5F008A8A1A /* libpng.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E39C49F89C198F5DCCBEC9D6; - remoteInfo = libpng_static_neon; - }; - 3454C33C1D011F5F008A8A1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = AB2A2848CDD879230450649F; - remoteInfo = zlib_x86_simd; - }; 3454C3AC1D012002008A8A1A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */; @@ -577,7 +622,14 @@ remoteGlobalIDString = 7364408688F1A6434987562A; remoteInfo = utils; }; - 3454C4401D012257008A8A1A /* PBXContainerItemProxy */ = { + 346F41A61D1ADFA600204DD2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 148B376C56BB5FE1630143B1; + remoteInfo = libwebp_dsp_neon; + }; + 346F41BA1D1ADFB000204DD2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */; proxyType = 1; @@ -619,13 +671,6 @@ remoteGlobalIDString = 3F107807570C4069BB96BE25; remoteInfo = libwebp_dsp; }; - 34F197A61C61883C00B41B54 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 148B376C56BB5FE1630143B1; - remoteInfo = libwebp_dsp_neon; - }; 34F197A81C61883C00B41B54 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */; @@ -677,6 +722,8 @@ 340303921C4053E500630F26 /* SkManagedStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkManagedStream.cpp; path = ../src/SkManagedStream.cpp; sourceTree = ""; }; 340303931C4053E500630F26 /* SkManagedStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedStream.h; path = ../src/SkManagedStream.h; sourceTree = ""; }; 340303DA1C40877300630F26 /* sk_xamarin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_xamarin.cpp; path = ../../src/sk_xamarin.cpp; sourceTree = ""; }; + 342BF1791D1ADCFD0072D19E /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../skia/out/gyp/dng_sdk.xcodeproj; sourceTree = ""; }; + 342BF17C1D1ADCFD0072D19E /* piex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = piex.xcodeproj; path = ../../skia/out/gyp/piex.xcodeproj; sourceTree = ""; }; 343DAE451C3F285700FAD826 /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../../src/SkiaKeeper.c; sourceTree = ""; }; 3454C2F01D011F3F008A8A1A /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../skia/out/gyp/pdf.xcodeproj; sourceTree = ""; }; 3454C31A1D011F5F008A8A1A /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../skia/out/gyp/skia_lib.xcodeproj; sourceTree = ""; }; @@ -686,7 +733,6 @@ 34F197851C61883C00B41B54 /* libjpeg-turbo-selector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo-selector.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo-selector.xcodeproj"; sourceTree = ""; }; 34F197881C61883C00B41B54 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = ""; }; 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../skia/out/gyp/libwebp.xcodeproj; sourceTree = ""; }; - 34FEFE421D0132B5002A83B6 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -694,8 +740,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 34FEFE431D0132B5002A83B6 /* libz.tbd in Frameworks */, - 3454C4421D01225F008A8A1A /* libwebp_dsp_neon.a in Frameworks */, + 346F41A81D1ADFA600204DD2 /* libwebp_dsp_neon.a in Frameworks */, + 342BF1911D1ADD2E0072D19E /* libdng_sdk.a in Frameworks */, + 342BF1921D1ADD2E0072D19E /* libpiex.a in Frameworks */, + 342BF1931D1ADD2E0072D19E /* libraw_codec.a in Frameworks */, + 342BF1941D1ADD2E0072D19E /* libzlib.a in Frameworks */, 3454C33E1D011F78008A8A1A /* libgiflib.a in Frameworks */, 3454C3411D011F78008A8A1A /* libpng_static.a in Frameworks */, 3454C3421D011F78008A8A1A /* libskia_codec_android.a in Frameworks */, @@ -737,7 +786,6 @@ 21FD2B261C014C000023CFAE = { isa = PBXGroup; children = ( - 34FEFE421D0132B5002A83B6 /* libz.tbd */, 21FD2D411C015F780023CFAE /* libc++.tbd */, 21FD2B3B1C014C110023CFAE /* skia_libs */, 21FD2B321C014C000023CFAE /* Source */, @@ -773,6 +821,8 @@ 21FD2B3B1C014C110023CFAE /* skia_libs */ = { isa = PBXGroup; children = ( + 342BF1791D1ADCFD0072D19E /* dng_sdk.xcodeproj */, + 342BF17C1D1ADCFD0072D19E /* piex.xcodeproj */, 3454C31A1D011F5F008A8A1A /* skia_lib.xcodeproj */, 3454C31D1D011F5F008A8A1A /* libpng.xcodeproj */, 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */, @@ -814,6 +864,7 @@ isa = PBXGroup; children = ( 21FD2D081C015ED70023CFAE /* libskia_codec.a */, + 342BF1671D1ADCD90072D19E /* libraw_codec.a */, ); name = Products; sourceTree = ""; @@ -904,6 +955,22 @@ name = Products; sourceTree = ""; }; + 342BF17A1D1ADCFD0072D19E /* Products */ = { + isa = PBXGroup; + children = ( + 342BF1831D1ADCFD0072D19E /* libdng_sdk.a */, + ); + name = Products; + sourceTree = ""; + }; + 342BF17D1D1ADCFD0072D19E /* Products */ = { + isa = PBXGroup; + children = ( + 342BF1881D1ADCFD0072D19E /* libpiex.a */, + ); + name = Products; + sourceTree = ""; + }; 3454C2F11D011F3F008A8A1A /* Products */ = { isa = PBXGroup; children = ( @@ -924,7 +991,6 @@ isa = PBXGroup; children = ( 3454C3321D011F5F008A8A1A /* libpng_static.a */, - 3454C3341D011F5F008A8A1A /* libpng_static_neon.a */, ); name = Products; sourceTree = ""; @@ -932,7 +998,7 @@ 3454C3211D011F5F008A8A1A /* Products */ = { isa = PBXGroup; children = ( - 3454C33D1D011F5F008A8A1A /* libzlib_x86_simd.a */, + 342BF1781D1ADCD90072D19E /* libzlib.a */, ); name = Products; sourceTree = ""; @@ -967,7 +1033,7 @@ 34F197A11C61883C00B41B54 /* libwebp_dec.a */, 34F197A31C61883C00B41B54 /* libwebp_demux.a */, 34F197A51C61883C00B41B54 /* libwebp_dsp.a */, - 34F197A71C61883C00B41B54 /* libwebp_dsp_neon.a */, + 346F41A71D1ADFA600204DD2 /* libwebp_dsp_neon.a */, 34F197A91C61883C00B41B54 /* libwebp_dsp_enc.a */, 34F197AB1C61883C00B41B54 /* libwebp_enc.a */, 34F197AD1C61883C00B41B54 /* libwebp_utils.a */, @@ -1004,7 +1070,11 @@ buildRules = ( ); dependencies = ( - 3454C4411D012257008A8A1A /* PBXTargetDependency */, + 346F41BB1D1ADFB000204DD2 /* PBXTargetDependency */, + 342BF18A1D1ADD1D0072D19E /* PBXTargetDependency */, + 342BF18C1D1ADD1D0072D19E /* PBXTargetDependency */, + 342BF18E1D1ADD1D0072D19E /* PBXTargetDependency */, + 342BF1901D1ADD1D0072D19E /* PBXTargetDependency */, 3454C3AD1D012002008A8A1A /* PBXTargetDependency */, 3454C3B11D012002008A8A1A /* PBXTargetDependency */, 3454C3B71D012002008A8A1A /* PBXTargetDependency */, @@ -1099,6 +1169,10 @@ ProductGroup = 21FD2CED1C015ED60023CFAE /* Products */; ProjectRef = 21FD2CEC1C015ED60023CFAE /* core.xcodeproj */; }, + { + ProductGroup = 342BF17A1D1ADCFD0072D19E /* Products */; + ProjectRef = 342BF1791D1ADCFD0072D19E /* dng_sdk.xcodeproj */; + }, { ProductGroup = 21FD2CF01C015ED60023CFAE /* Products */; ProjectRef = 21FD2CEF1C015ED60023CFAE /* effects.xcodeproj */; @@ -1147,6 +1221,10 @@ ProductGroup = 3454C2F11D011F3F008A8A1A /* Products */; ProjectRef = 3454C2F01D011F3F008A8A1A /* pdf.xcodeproj */; }, + { + ProductGroup = 342BF17D1D1ADCFD0072D19E /* Products */; + ProjectRef = 342BF17C1D1ADCFD0072D19E /* piex.xcodeproj */; + }, { ProductGroup = 21FD2CFE1C015ED60023CFAE /* Products */; ProjectRef = 21FD2CFD1C015ED60023CFAE /* ports.xcodeproj */; @@ -1302,6 +1380,34 @@ remoteRef = 21FD2D7C1C0163140023CFAE /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 342BF1671D1ADCD90072D19E /* libraw_codec.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libraw_codec.a; + remoteRef = 342BF1661D1ADCD90072D19E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 342BF1781D1ADCD90072D19E /* libzlib.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libzlib.a; + remoteRef = 342BF1771D1ADCD90072D19E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 342BF1831D1ADCFD0072D19E /* libdng_sdk.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libdng_sdk.a; + remoteRef = 342BF1821D1ADCFD0072D19E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 342BF1881D1ADCFD0072D19E /* libpiex.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libpiex.a; + remoteRef = 342BF1871D1ADCFD0072D19E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 3454C3171D011F3F008A8A1A /* libnopdf.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1330,18 +1436,11 @@ remoteRef = 3454C3311D011F5F008A8A1A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 3454C3341D011F5F008A8A1A /* libpng_static_neon.a */ = { + 346F41A71D1ADFA600204DD2 /* libwebp_dsp_neon.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libpng_static_neon.a; - remoteRef = 3454C3331D011F5F008A8A1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3454C33D1D011F5F008A8A1A /* libzlib_x86_simd.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libzlib_x86_simd.a; - remoteRef = 3454C33C1D011F5F008A8A1A /* PBXContainerItemProxy */; + path = libwebp_dsp_neon.a; + remoteRef = 346F41A61D1ADFA600204DD2 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 34F197941C61883C00B41B54 /* yasm-win */ = { @@ -1379,13 +1478,6 @@ remoteRef = 34F197A41C61883C00B41B54 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34F197A71C61883C00B41B54 /* libwebp_dsp_neon.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libwebp_dsp_neon.a; - remoteRef = 34F197A61C61883C00B41B54 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 34F197A91C61883C00B41B54 /* libwebp_dsp_enc.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1434,6 +1526,26 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 342BF18A1D1ADD1D0072D19E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = dng_sdk; + targetProxy = 342BF1891D1ADD1D0072D19E /* PBXContainerItemProxy */; + }; + 342BF18C1D1ADD1D0072D19E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = piex; + targetProxy = 342BF18B1D1ADD1D0072D19E /* PBXContainerItemProxy */; + }; + 342BF18E1D1ADD1D0072D19E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = raw_codec; + targetProxy = 342BF18D1D1ADD1D0072D19E /* PBXContainerItemProxy */; + }; + 342BF1901D1ADD1D0072D19E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = zlib; + targetProxy = 342BF18F1D1ADD1D0072D19E /* PBXContainerItemProxy */; + }; 3454C3AD1D012002008A8A1A /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = codec; @@ -1689,10 +1801,10 @@ name = utils; targetProxy = 3454C43E1D012002008A8A1A /* PBXContainerItemProxy */; }; - 3454C4411D012257008A8A1A /* PBXTargetDependency */ = { + 346F41BB1D1ADFB000204DD2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = libwebp_dsp_neon; - targetProxy = 3454C4401D012257008A8A1A /* PBXContainerItemProxy */; + targetProxy = 346F41BA1D1ADFB000204DD2 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1741,12 +1853,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - TVOS_DEPLOYMENT_TARGET = 9.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-all_load"; SDKROOT = appletvos; - TARGETED_DEVICE_FAMILY = "3"; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.1; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1794,11 +1906,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - TVOS_DEPLOYMENT_TARGET = 9.1; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-all_load"; SDKROOT = appletvos; - TARGETED_DEVICE_FAMILY = "3"; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.1; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = "";