Update skia

friction2d · Aug 4, 2024 · 6170a72 · 6170a72
1 parent 41f2145
commit 6170a72
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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