mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into beta

Browse Source
This commit is contained in:
David Capello 2022-03-04 23:56:55 -03:00
commit 7e1d3832f0
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laf

@ -1 +1 @@
Subproject commit 7c819791e50116b54e0666dbf96822e0993d1d1f
Subproject commit 02ed21d1214ff913150fe3caf1470f2ee0dc6f14

4
src/dio/CMakeLists.txt
View File

@ -1,4 +1,5 @@
# Aseprite Document IO Library
# Copyright (c) 2022 Igara Studio S.A.
# Copyright (c) 2016-2018 David Capello
add_library(dio-lib
@ -15,3 +16,6 @@ target_link_libraries(dio-lib
laf-base
fixmath-lib
doc-lib)
target_include_directories(dio-lib
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)

2
src/dio/LICENSE.txt
View File

@ -1,4 +1,4 @@
Copyright (c) 2018-2021 Igara Studio S.A.
Copyright (c) 2018-2022 Igara Studio S.A.
Copyright (c) 2016-2018 David Capello
Permission is hereby granted, free of charge, to any person obtaining

5
src/doc/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# Aseprite Document Library
# Copyright (C) 2019-2021 Igara Studio S.A.
# Copyright (C) 2019-2022 Igara Studio S.A.
# Copyright (C) 2001-2018 David Capello
if(WIN32)
@ -82,3 +82,6 @@ target_link_libraries(doc-lib
laf-base
fixmath-lib
cityhash)
target_include_directories(doc-lib
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)

2
src/doc/LICENSE.txt
View File

@ -1,4 +1,4 @@
Copyright (c) 2018-2021 Igara Studio S.A.
Copyright (c) 2018-2022 Igara Studio S.A.
Copyright (c) 2001-2018 David Capello
Permission is hereby granted, free of charge, to any person obtaining

3
src/fixmath/CMakeLists.txt
View File

@ -6,3 +6,6 @@ add_library(fixmath-lib
target_link_libraries(fixmath-lib
laf-base)
target_include_directories(fixmath-lib
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)