Try applying patch to fix zlib include dir

Also raised minimum CMake version to match the one of Aseprite.
mapeditor · Jan 10, 2025 · b3edeb9 · b3edeb9
1 parent 0afdbc3
commit b3edeb9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -148,7 +148,9 @@ jobs:
         CC: i686-w64-mingw32-gcc.exe
         CXX: i686-w64-mingw32-g++.exe
       run: |
-        cmake -B build -DCMAKE_BUILD_TYPE=Release \
-          -DUSE_SHARED_ZLIB=on
+        pushd aseprite
+        patch -p1 < ..\aseprite-fix-zlib-include.patch
+        popd
+        cmake -B build -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release
         cmake --install build --config Release
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.16)
 
 project(qaseprite LANGUAGES CXX)
 

diff --git a/aseprite-fix-zlib-include.patch b/aseprite-fix-zlib-include.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index af09ed229..b1bd0189b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,7 +234,7 @@ else()
+   set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
+   set(ZLIB_INCLUDE_DIRS
+     ${ZLIB_DIR}
+-    ${CMAKE_BINARY_DIR}/third_party/zlib) # Zlib generated zconf.h file
++    ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib) # Zlib generated zconf.h file
+   set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRS} CACHE PATH "")
+ endif()
+ include_directories(${ZLIB_INCLUDE_DIRS})