From 6170a729371fc6f8ff840997f6fe6f1f0389a426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= <ole.andre.rodlie@gmail.com>
Date: Sun, 4 Aug 2024 03:35:28 +0200
Subject: [PATCH] Update skia

---
 src/cmake/friction-common.cmake | 1 +
 src/engine/CMakeLists.txt       | 6 +++++-
 src/engine/skia                 | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/cmake/friction-common.cmake b/src/cmake/friction-common.cmake
index 0e575f166..0566f5a68 100644
--- a/src/cmake/friction-common.cmake
+++ b/src/cmake/friction-common.cmake
@@ -104,6 +104,7 @@ if(WIN32)
         skia
         user32
         opengl32)
+    add_definitions(-DSKIA_DLL)
 else()
     if(APPLE)
         set(SKIA_LIBRARIES skia)
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
index f2b11ddd8..fd49e61e9 100644
--- a/src/engine/CMakeLists.txt
+++ b/src/engine/CMakeLists.txt
@@ -50,7 +50,7 @@ if(WIN32)
     else()
         set(SKIA_UPDATE_CMD :)
     endif()
-    set(SKIA_ARGS "target_os=\"windows\" host_os=\"win\" current_os=\"win\" target_cpu=\"x64\"")
+    set(SKIA_ARGS "target_os=\"windows\" host_os=\"win\" current_os=\"win\" target_cpu=\"x64\" is_component_build=true")
     set(SKIA_ARGS "${SKIA_ARGS} clang_win=\"C:\\Program Files\\LLVM\" cc=\"clang-cl\" cxx=\"clang-cl\"")
     set(SKIA_ARGS "${SKIA_ARGS} extra_cflags=[\"-Wno-error\",\"/MD\",\"/O2\"]")
 else()
@@ -104,3 +104,7 @@ ExternalProject_Add(
     USES_TERMINAL_CONFIGURE true
     USES_TERMINAL_BUILD true
 )
+
+if(WIN32)
+    add_custom_command(TARGET Engine POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${SKIA_BUILD_DIR}/skia.dll.lib ${SKIA_BUILD_DIR}/skia.lib)
+endif()
diff --git a/src/engine/skia b/src/engine/skia
index c4284e9bd..3d55448fe 160000
--- a/src/engine/skia
+++ b/src/engine/skia
@@ -1 +1 @@
-Subproject commit c4284e9bdd1f794e1c72328924ad519fd0d736cf
+Subproject commit 3d55448feb27f949b19d4a3809e40ecf3bb5532a