From adda2216184d770cd25423c23c7967a294c8bca8 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Thu, 14 Nov 2024 17:37:12 +0200 Subject: [PATCH] attemp to fix ci --- externals/CMakeLists.txt | 1 + src/core/file_format/pkg.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index dd6a8dcd6..8d080acc3 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -163,6 +163,7 @@ set(PNG_TOOLS OFF CACHE BOOL "" FORCE) set(SKIP_INSTALL_ALL OFF CACHE BOOL "" FORCE) set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib-ng" CACHE STRING "" FORCE) set(ZLIB_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/zlib-ng/zlibstatic-ngd" CACHE STRING "" FORCE) +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng/zlib.h" "#include \"../zlib-ng/zlib.h\"") add_subdirectory(libpng) if (APPLE) diff --git a/src/core/file_format/pkg.cpp b/src/core/file_format/pkg.cpp index 1aac2f7a7..a6b5eb9a8 100644 --- a/src/core/file_format/pkg.cpp +++ b/src/core/file_format/pkg.cpp @@ -7,8 +7,7 @@ #include "core/file_format/pkg.h" #include "core/file_format/pkg_type.h" -static void DecompressPFSC(std::span compressed_data, - std::span decompressed_data) { +static void DecompressPFSC(std::span compressed_data, std::span decompressed_data) { z_stream decompressStream; decompressStream.zalloc = Z_NULL; decompressStream.zfree = Z_NULL;