mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-09-15 15:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into beta

Browse Source
This commit is contained in:
David Capello 2021-06-17 11:03:25 -03:00
commit c2ab21356f
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
third_party/CMakeLists.txt vendored
View File

@ -83,6 +83,7 @@ add_subdirectory(fmt)
# Add cmark without tests
if(NOT USE_SHARED_CMARK)
set(CMARK_PROGRAM OFF CACHE BOOL "Build cmark executable")
set(CMARK_TESTS OFF CACHE BOOL "Build cmark tests and enable testing")
add_subdirectory(cmark)
endif()
@ -98,6 +99,9 @@ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if fou
set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
set(ENABLE_CAT OFF CACHE BOOL "Enable cat building")
set(ENABLE_TAR OFF CACHE BOOL "Enable tar building")
set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building")
add_subdirectory(libarchive)
target_include_directories(archive_static INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
@ -153,6 +157,7 @@ if(ENABLE_SCRIPTING)
lua/ltablib.c
lua/lutf8lib.c)
target_compile_definitions(lua PUBLIC LUA_FLOORN2I=1)
target_compile_definitions(lualib PRIVATE HAVE_SYSTEM)
target_include_directories(lua PUBLIC lua)
target_include_directories(lauxlib PUBLIC lua)
target_include_directories(lualib PUBLIC lua)

2
third_party/cmark vendored

@ -1 +1 @@
Subproject commit 8a023286198a7e408398e282f293e3b0baebb644
Subproject commit 728c68465062223295076d8cb365ca911a55a218

2
third_party/libarchive vendored

@ -1 +1 @@
Subproject commit 9975d20ebe3ee53e18d772264fa34ea858939a9b
Subproject commit 6b78ac93532fa0d2669e538b197b51fb92af5520

2
third_party/lua vendored

@ -1 +1 @@
Subproject commit 8dffcf2097b7f893c338acf5db739ed1d36bbc55
Subproject commit 9b86693268347da63de3fcbbd48c049e188da145