diff --git a/build.cake b/build.cake index 1742f6b6..d94d45fd 100644 --- a/build.cake +++ b/build.cake @@ -544,7 +544,7 @@ Task ("externals-osx") .Does (() => { var buildArch = new Action ((arch, skiaArch) => { - RunGyp ("skia_arch_type='" + skiaArch + "' skia_gpu=1", "ninja,xcode"); + RunGyp ("skia_arch_type='" + skiaArch + "' skia_gpu=1 skia_osx_deployment_target=10.7", "ninja,xcode"); XCodeBuild (new XCodeBuildSettings { Project = "native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj", @@ -596,7 +596,7 @@ Task ("externals-ios") // set up the gyp environment variables AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); - RunGyp ("skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0 skia_gpu=1", "ninja,xcode"); + RunGyp ("skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0 skia_gpu=1 ios_sdk_version=8.0", "ninja,xcode"); buildArch ("iphonesimulator", "i386"); buildArch ("iphonesimulator", "x86_64"); @@ -625,7 +625,7 @@ Task ("externals-tvos") var convertIOSToTVOS = new Action (() => { var glob = "./skia/out/gyp/*.xcodeproj/project.pbxproj"; ReplaceTextInFiles (glob, "SDKROOT = iphoneos;", "SDKROOT = appletvos;"); - ReplaceTextInFiles (glob, "IPHONEOS_DEPLOYMENT_TARGET = 9.2;", "TVOS_DEPLOYMENT_TARGET = 9.1;"); + ReplaceTextInFiles (glob, "IPHONEOS_DEPLOYMENT_TARGET", "TVOS_DEPLOYMENT_TARGET"); ReplaceTextInFiles (glob, "TARGETED_DEVICE_FAMILY = \"1,2\";", "TARGETED_DEVICE_FAMILY = 3;"); ReplaceTextInFiles (glob, "\"CODE_SIGN_IDENTITY[sdk=iphoneos*]\" = \"iPhone Developer\";", ""); }); @@ -647,7 +647,7 @@ Task ("externals-tvos") // set up the gyp environment variables AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); - RunGyp ("skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0 skia_gpu=1", "ninja,xcode"); + RunGyp ("skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0 skia_gpu=1 ios_sdk_version=9.0", "ninja,xcode"); convertIOSToTVOS(); buildArch ("appletvsimulator", "x86_64"); diff --git a/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj b/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj index 9ab01175..cb5ef988 100644 --- a/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj @@ -181,6 +181,13 @@ remoteGlobalIDString = 58D65910B589341DD97198F8; remoteInfo = libetc1; }; + 342DF2121D7BBBB00078246B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 21FD2CFA1C015ED60023CFAE /* opts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C7E8882721F7612ABD656185; + remoteInfo = opts_crc32; + }; 3454C3161D011F3F008A8A1A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 3454C2F01D011F3F008A8A1A /* pdf.xcodeproj */; @@ -629,13 +636,6 @@ remoteGlobalIDString = 2DCF672F726600FFFAE0A889; remoteInfo = piex; }; - 34F197931C61883C00B41B54 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34F197881C61883C00B41B54 /* libjpeg-turbo.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6C7F36B7E05C9CAE89B0BAC9; - remoteInfo = "yasm-win"; - }; 34F197951C61883C00B41B54 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 34F197881C61883C00B41B54 /* libjpeg-turbo.xcodeproj */; @@ -905,6 +905,7 @@ isa = PBXGroup; children = ( 21FD2D211C015ED70023CFAE /* libskia_opts.a */, + 342DF2131D7BBBB00078246B /* libskia_opts_crc32.a */, 21FD2D231C015ED70023CFAE /* libskia_opts_ssse3.a */, 21FD2D251C015ED70023CFAE /* libskia_opts_sse41.a */, 21FD2D271C015ED70023CFAE /* libskia_opts_sse42.a */, @@ -1021,7 +1022,6 @@ 34F197891C61883C00B41B54 /* Products */ = { isa = PBXGroup; children = ( - 34F197941C61883C00B41B54 /* yasm-win */, 34F197961C61883C00B41B54 /* libjpeg-turbo.a */, ); name = Products; @@ -1380,6 +1380,13 @@ remoteRef = 21FD2D7C1C0163140023CFAE /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 342DF2131D7BBBB00078246B /* libskia_opts_crc32.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libskia_opts_crc32.a; + remoteRef = 342DF2121D7BBBB00078246B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 3454C3171D011F3F008A8A1A /* libnopdf.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1436,13 +1443,6 @@ remoteRef = 34BEEE671D1AAC73002A1E48 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34F197941C61883C00B41B54 /* yasm-win */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = "yasm-win"; - remoteRef = 34F197931C61883C00B41B54 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 34F197961C61883C00B41B54 /* libjpeg-turbo.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1855,7 +1855,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-all_load"; @@ -1910,7 +1910,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-all_load"; SDKROOT = iphoneos; diff --git a/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj b/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj index a1378bb4..dea52122 100644 --- a/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj @@ -1637,6 +1637,7 @@ ../../skia/include/utils, ../../skia/include/config, ); + MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_CPLUSPLUSFLAGS = ( "-std=c++0x", "-stdlib=libc++", @@ -1663,6 +1664,7 @@ ../../skia/include/utils, ../../skia/include/config, ); + MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_CPLUSPLUSFLAGS = ( "-std=c++0x", "-stdlib=libc++", diff --git a/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj b/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj index 17d1f14e..023b481b 100644 --- a/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj @@ -1948,6 +1948,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "xamarin.libskia-ios"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -1982,6 +1983,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "xamarin.libskia-ios"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; };