skia: Linux changes

friction2d · Dec 26, 2024 · 3f73d2f · 3f73d2f
1 parent b8cfe8c
commit 3f73d2f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/cmake/friction-common.cmake b/src/cmake/friction-common.cmake
@@ -103,7 +103,11 @@ if(WIN32)
     add_definitions(-DSKIA_DLL)
     set(SKIA_LIBRARIES_DIRS ${CMAKE_SOURCE_DIR}/sdk/bin)
 else()
-    set(SKIA_LIBRARIES skia)
+    if(APPLE)
+        set(SKIA_LIBRARIES skia)
+    else()
+        set(SKIA_LIBRARIES skia.friction)
+    endif()
     if(UNIX AND NOT APPLE)
         pkg_check_modules(UNWIND REQUIRED libunwind)
         set(GPERF_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/../gperftools ${UNWIND_INCLUDE_DIRS})

diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
@@ -134,6 +134,16 @@ ExternalProject_Add(
     USES_TERMINAL_BUILD true
 )
 
+if(UNIX AND NOT APPLE)
+    include(GNUInstallDirs)
+    install(
+        FILES
+        ${SKIA_BUILD_DIR}/libskia.friction.so
+        DESTINATION
+        ${CMAKE_INSTALL_LIBDIR}
+    )
+endif()
+
 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