Build using the older gcc 6.2 and new llvm 10 compiler (#1806)

mono · Sep 12, 2021 · 5d1f324 · 5d1f324
1 parent f8dbe84
commit 5d1f324
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/externals/skia b/externals/skia
diff --git 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
@@ -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
@@ -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