Skip to content

Updated aseprite submodule #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Updated aseprite submodule #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aseprite
Open in desktop
Submodule aseprite updated 26 files
+1 −0 .clang-tidy
+1 −1 .github/workflows/build.yml
+1 −1 CMakeLists.txt
+ − data/extensions/aseprite-theme/sheet.png
+1 −1 data/widgets/about.xml
+1 −1 laf
+4 −3 src/app/commands/cmd_keyboard_shortcuts.cpp
+4 −3 src/app/commands/cmd_layer_lock.cpp
+13 −0 src/app/doc.cpp
+7 −0 src/app/doc.h
+3 −0 src/app/doc_observer.h
+2 −2 src/app/script/api_version.h
+7 −1 src/app/ui/editor/editor.cpp
+2 −1 src/app/ui/editor/editor.h
+3 −0 src/app/ui/editor/editor_state.h
+25 −6 src/app/ui/editor/moving_pixels_state.cpp
+4 −0 src/app/ui/editor/moving_pixels_state.h
+1 −1 src/app/ui/export_file_window.cpp
+1 −1 src/app/ui/key.h
+2 −2 src/app/ui/keyboard_shortcuts.cpp
+17 −12 src/app/ui/timeline/timeline.cpp
+1 −1 src/main/resources_win32.rc
+27 −0 src/ui/window.cpp
+1 −0 src/ui/window.h
+1 −1 src/ver/info.c
+1 −1 third_party/cityhash
13 changes: 0 additions & 13 deletions aseprite-fix-zlib-include.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions cityhash-fix-byteswap.patch
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions laf-include-cstdint.patch
View file
Open in desktop

This file was deleted.