forked from aki/docker-aseprite-linux
fix(manifest): Correct Skia installation paths the path Aseprite expects
This commit is contained in:
parent
1b1ebf70a7
commit
26d41667a6
@ -101,22 +101,17 @@ modules:
|
||||
- echo "Building Skia with Ninja (this may take a while)..."
|
||||
- ninja -C out/Release-x64 skia modules
|
||||
|
||||
- echo "Listing Skia build output structure (out/Release-x64):"
|
||||
- ls -R out/Release-x64
|
||||
- echo "Listing Skia main include directory structure (include):"
|
||||
- ls -R include
|
||||
|
||||
# Create directory structure for Aseprite
|
||||
- echo "Installing Skia libraries and headers..."
|
||||
- install -d /app/lib
|
||||
- install -d /app/include/skia
|
||||
- install -d /app/include # Changed from /app/include/skia
|
||||
- install -d /app/third_party/externals
|
||||
|
||||
# Install Skia library
|
||||
- install -m644 out/Release-x64/libskia.a /app/lib/libskia.a
|
||||
|
||||
# Copy headers
|
||||
- cp -r include/* /app/include/skia/
|
||||
- cp -r include/* /app/include/ # Changed from /app/include/skia/
|
||||
|
||||
# Extract and install libraries that Aseprite needs
|
||||
- |
|
||||
@ -226,23 +221,23 @@ modules:
|
||||
- -DSKIA_LIBRARY_DIR=/app/lib
|
||||
- -DSKIA_LIBRARY=/app/lib/libskia.a
|
||||
# Use Skia's bundled libraries (static) or SDK-provided shared libraries
|
||||
- -DUSE_SHARED_JPEG=OFF # Bundled static with Skia
|
||||
# -DUSE_SHARED_JPEG=OFF # Unused by Aseprite's CMake
|
||||
- -DUSE_SHARED_LIBPNG=ON # Provided by SDK (shared)
|
||||
- -DUSE_SHARED_ZLIB=ON # Provided by SDK (shared)
|
||||
- -DUSE_SHARED_GIFLIB=ON # Provided by SDK (shared)
|
||||
- -DUSE_SHARED_WEBP=OFF # Bundled static with Skia
|
||||
# -DUSE_SHARED_WEBP=OFF # Unused by Aseprite's CMake
|
||||
- -DUSE_SHARED_FREETYPE=OFF # Bundled static with Skia
|
||||
- -DUSE_SHARED_HARFBUZZ=OFF # Bundled static with Skia
|
||||
# Set library locations explicitly for bundled static libs
|
||||
# CMake standard variable names (often plural for DIRS/LIBRARIES)
|
||||
- -DWebP_INCLUDE_DIRS=/app/third_party/externals/libwebp/src
|
||||
- -DWebP_LIBRARIES=/app/lib/libwebp.a
|
||||
- -DJPEG_INCLUDE_DIRS=/app/third_party/externals/libjpeg-turbo
|
||||
- -DJPEG_LIBRARIES=/app/lib/libjpeg.a
|
||||
- -DFreetype_INCLUDE_DIRS=/app/third_party/externals/freetype/include
|
||||
- -DFreetype_LIBRARIES=/app/lib/libfreetype.a
|
||||
- -DHarfBuzz_INCLUDE_DIRS=/app/third_party/externals/harfbuzz/src
|
||||
- -DHarfBuzz_LIBRARIES=/app/lib/libharfbuzz.a
|
||||
# The following explicit paths were unused by Aseprite's CMake.
|
||||
# Aseprite likely finds these via Skia's CMake config or other means.
|
||||
# - -DWebP_INCLUDE_DIRS=/app/third_party/externals/libwebp/src
|
||||
# - -DWebP_LIBRARIES=/app/lib/libwebp.a
|
||||
# - -DJPEG_INCLUDE_DIRS=/app/third_party/externals/libjpeg-turbo
|
||||
# - -DJPEG_LIBRARIES=/app/lib/libjpeg.a
|
||||
# - -DFreetype_INCLUDE_DIRS=/app/third_party/externals/freetype/include
|
||||
# - -DFreetype_LIBRARIES=/app/lib/libfreetype.a
|
||||
# - -DHarfBuzz_INCLUDE_DIRS=/app/third_party/externals/harfbuzz/src
|
||||
# - -DHarfBuzz_LIBRARIES=/app/lib/libharfbuzz.a
|
||||
build-commands:
|
||||
# Standard ninja build
|
||||
- ninja
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user