move libraries to "third-party" directory (#1879)

This commit is contained in:
Roman Fomin 2024-09-04 01:52:17 +07:00 committed by GitHub
parent bbead25071
commit cd63e89417
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 37 additions and 51 deletions

View File

@ -166,8 +166,7 @@ jobs:
--std=c99 \
--suppress="memleak:${{ github.workspace }}/src/u_scanner.c" \
--project="${{ github.workspace }}/build/compile_commands.json" \
-i"${{ github.workspace }}/miniz" \
-i"${{ github.workspace }}/spng" \
-i"${{ github.workspace }}/third-party" \
-D__GNUC__
- name: Run Clang-Tidy
@ -188,4 +187,4 @@ jobs:
,-clang-analyzer-security*
,-clang-analyzer-valist*
database: 'build'
ignore: 'miniz|spng|win32|toolsrc|src/i_pcsound.c'
ignore: 'third-party|win32|toolsrc|src/i_pcsound.c'

View File

@ -202,8 +202,7 @@ include(CPack)
add_subdirectory(data)
add_subdirectory(opl)
add_subdirectory(textscreen)
add_subdirectory(miniz)
add_subdirectory(spng)
add_subdirectory(third-party)
add_subdirectory(src)
add_subdirectory(setup)
add_subdirectory(docs)

View File

@ -211,13 +211,13 @@ Files: `data/woof.ico, data/woof.png, src/icon.c, data/setup.ico, data/woof-setu
Copyright: © 2020-2022 Julia Nechaevskaya.
License: [CC-BY-3.0](https://creativecommons.org/licenses/by/3.0/)
Files: `miniz/*`
Files: `third-party/miniz/*`
Copyright:
© 2010-2014 Rich Geldreich and Tenacious Software LLC;
© 2013-2014 RAD Game Tools and Valve Software.
License: [MIT](https://opensource.org/licenses/MIT)
Files: `spng/*`
Files: `third-party/spng/*`
Copyright: © 2018-2023 Randy.
License: [BSD-2-Clause](https://opensource.org/license/bsd-2-clause)

View File

@ -1,11 +0,0 @@
include(WoofSettings)
add_library(miniz STATIC miniz.c miniz.h)
target_woof_settings(miniz)
target_compile_definitions(miniz PRIVATE MINIZ_NO_TIME)
target_include_directories(miniz INTERFACE ".")
target_link_libraries(miniz)

View File

@ -1,11 +0,0 @@
include(WoofSettings)
add_library(spng STATIC spng.c spng.h)
target_woof_settings(spng)
target_compile_definitions(spng PRIVATE SPNG_USE_MINIZ INTERFACE SPNG_STATIC)
target_include_directories(spng INTERFACE ".")
target_link_libraries(spng miniz)

10
third-party/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,10 @@
include(WoofSettings)
add_library(miniz STATIC miniz/miniz.c)
target_compile_definitions(miniz PRIVATE MINIZ_NO_TIME)
target_include_directories(miniz INTERFACE miniz)
add_library(spng STATIC spng/spng.c)
target_compile_definitions(spng PRIVATE SPNG_USE_MINIZ INTERFACE SPNG_STATIC)
target_include_directories(spng INTERFACE spng)
target_link_libraries(spng miniz)