diff --git a/externals/skia b/externals/skia index b2c81806f3..be5de14f94 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit b2c81806f30929802d755eab1e49ee1024a950dc +Subproject commit be5de14f94d5c3d36df37e085d65165c62aebe22 diff --git a/native/tizen/build.cake b/native/tizen/build.cake index 28b8a19f25..01bdc9e7f3 100644 --- a/native/tizen/build.cake +++ b/native/tizen/build.cake @@ -34,7 +34,7 @@ Task("libSkiaSharp") $"skia_use_system_libpng=false " + $"skia_use_system_libwebp=false " + $"skia_use_system_zlib=true " + - $"extra_cflags=[ '-DSKIA_C_DLL', '-DXML_DEV_URANDOM' ] " + + $"extra_cflags=[ '-DSKIA_C_DLL', '-DXML_DEV_URANDOM', '-DSK_NO_MAKE_SHARED_PTR' ] " + $"ncli='{TIZEN_STUDIO_HOME}' " + $"ncli_version='4.0'"); diff --git a/native/tizen/libSkiaSharp/project_def.prop b/native/tizen/libSkiaSharp/project_def.prop index 64ee95390f..997c63a9be 100644 --- a/native/tizen/libSkiaSharp/project_def.prop +++ b/native/tizen/libSkiaSharp/project_def.prop @@ -25,6 +25,7 @@ USER_DEFS = NDEBUG \ SK_ENCODE_WEBP \ SK_GAMMA_APPLY_TO_A8 \ SK_GL \ + SK_NO_MAKE_SHARED_PTR \ SK_R32_SHIFT=16 \ SK_SUPPORT_PDF \ SK_USE_LIBGIFCODEC \ diff --git a/scripts/install-tizen.ps1 b/scripts/install-tizen.ps1 index e447a86f59..e756339c46 100644 --- a/scripts/install-tizen.ps1 +++ b/scripts/install-tizen.ps1 @@ -83,10 +83,10 @@ function Swap-Tool { if ($UpgradeLLVM) { Write-Host "Upgrading LLVM and GCC in place..." Swap-Tool "llvm-4.0.0" "llvm-10" - Swap-Tool "aarch64-linux-gnu-gcc-6.2" "aarch64-linux-gnu-gcc-9.2" - Swap-Tool "arm-linux-gnueabi-gcc-6.2" "arm-linux-gnueabi-gcc-9.2" - Swap-Tool "i586-linux-gnueabi-gcc-6.2" "i586-linux-gnueabi-gcc-9.2" - Swap-Tool "x86_64-linux-gnu-gcc-6.2" "x86_64-linux-gnu-gcc-9.2" + # Swap-Tool "aarch64-linux-gnu-gcc-6.2" "aarch64-linux-gnu-gcc-9.2" + # Swap-Tool "arm-linux-gnueabi-gcc-6.2" "arm-linux-gnueabi-gcc-9.2" + # Swap-Tool "i586-linux-gnueabi-gcc-6.2" "i586-linux-gnueabi-gcc-9.2" + # Swap-Tool "x86_64-linux-gnu-gcc-6.2" "x86_64-linux-gnu-gcc-9.2" } # make sure that Tizen Studio is in TIZEN_STUDIO_HOME