diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88988ac..f201456 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -116,13 +116,11 @@ jobs: qt_arch: win32_mingw81 qt_tools: tools_mingw,qt.tools.win32_mingw810 cmake_args: -G "MinGW Makefiles" - mingw_dir: mingw810_32 - windows_version: 2022 qt_version: 6.8.1 qt_arch: win64_mingw qt_tools: tools_mingw1310,qt.tools.win64_mingw1310 cmake_args: -G "MinGW Makefiles" - mingw_dir: mingw1310_64 defaults: run: @@ -145,15 +143,10 @@ jobs: - name: Build run: | pushd aseprite - patch -p1 < ../aseprite-fix-zlib-include.patch patch -p1 < ../aseprite-msvc-dynamic-runtime.patch popd pushd aseprite/laf patch -p1 < ../../laf-msvc-dynamic-runtime.patch - patch -p1 < ../../laf-include-cstdint.patch - popd - pushd aseprite/third_party/cityhash - patch -p1 < ../../../cityhash-fix-byteswap.patch popd cmake -B build -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }} cmake --build build --config Release diff --git a/aseprite b/aseprite index 71654e4..9779470 160000 --- a/aseprite +++ b/aseprite @@ -1 +1 @@ -Subproject commit 71654e4b8ead2252faa997bd73e18f3e5d9033c4 +Subproject commit 9779470d0eb02ec937b2203e4de1e1cb06414fa2 diff --git a/aseprite-fix-zlib-include.patch b/aseprite-fix-zlib-include.patch deleted file mode 100644 index b436c09..0000000 --- a/aseprite-fix-zlib-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -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}) diff --git a/cityhash-fix-byteswap.patch b/cityhash-fix-byteswap.patch deleted file mode 100644 index 98c40c8..0000000 --- a/cityhash-fix-byteswap.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/city.cc b/src/city.cc -index 41cd5ee..a362d8c 100644 ---- a/src/city.cc -+++ b/src/city.cc -@@ -47,7 +47,7 @@ static uint32 UNALIGNED_LOAD32(const char *p) { - return result; - } - --#ifdef _MSC_VER -+#ifdef _WIN32 - - #include - #define bswap_32(x) _byteswap_ulong(x) diff --git a/laf-include-cstdint.patch b/laf-include-cstdint.patch deleted file mode 100644 index c3344aa..0000000 --- a/laf-include-cstdint.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/base/win/ver_query_values.cpp b/base/win/ver_query_values.cpp -index 71df1a7..88944cf 100644 ---- a/base/win/ver_query_values.cpp -+++ b/base/win/ver_query_values.cpp -@@ -12,6 +12,7 @@ - - #include "base/string.h" - -+#include - #include - #include - #include