mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-08-04 16:32:39 +00:00
attemp to fix ci
This commit is contained in:
parent
3c5531a091
commit
adda221618
1
externals/CMakeLists.txt
vendored
1
externals/CMakeLists.txt
vendored
@ -163,6 +163,7 @@ set(PNG_TOOLS OFF CACHE BOOL "" FORCE)
|
|||||||
set(SKIP_INSTALL_ALL 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_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)
|
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)
|
add_subdirectory(libpng)
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
|
@ -7,8 +7,7 @@
|
|||||||
#include "core/file_format/pkg.h"
|
#include "core/file_format/pkg.h"
|
||||||
#include "core/file_format/pkg_type.h"
|
#include "core/file_format/pkg_type.h"
|
||||||
|
|
||||||
static void DecompressPFSC(std::span<char> compressed_data,
|
static void DecompressPFSC(std::span<char> compressed_data, std::span<char> decompressed_data) {
|
||||||
std::span<char> decompressed_data) {
|
|
||||||
z_stream decompressStream;
|
z_stream decompressStream;
|
||||||
decompressStream.zalloc = Z_NULL;
|
decompressStream.zalloc = Z_NULL;
|
||||||
decompressStream.zfree = Z_NULL;
|
decompressStream.zfree = Z_NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user