diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f5a26b76..d734b4b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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' diff --git a/CMakeLists.txt b/CMakeLists.txt index fc6126e1..71f04401 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/README.md b/README.md index cfd448ac..9d573cf7 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/miniz/CMakeLists.txt b/miniz/CMakeLists.txt deleted file mode 100644 index cf005b3d..00000000 --- a/miniz/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/spng/CMakeLists.txt b/spng/CMakeLists.txt deleted file mode 100644 index 65c8287f..00000000 --- a/spng/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt new file mode 100644 index 00000000..a11a17c3 --- /dev/null +++ b/third-party/CMakeLists.txt @@ -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) diff --git a/miniz/LICENSE b/third-party/miniz/LICENSE similarity index 98% rename from miniz/LICENSE rename to third-party/miniz/LICENSE index 1982f4bb..b6ff45a3 100644 --- a/miniz/LICENSE +++ b/third-party/miniz/LICENSE @@ -1,22 +1,22 @@ -Copyright 2013-2014 RAD Game Tools and Valve Software -Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC - -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +Copyright 2013-2014 RAD Game Tools and Valve Software +Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC + +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/miniz/miniz.c b/third-party/miniz/miniz.c similarity index 100% rename from miniz/miniz.c rename to third-party/miniz/miniz.c diff --git a/miniz/miniz.h b/third-party/miniz/miniz.h similarity index 100% rename from miniz/miniz.h rename to third-party/miniz/miniz.h diff --git a/spng/LICENSE b/third-party/spng/LICENSE similarity index 100% rename from spng/LICENSE rename to third-party/spng/LICENSE diff --git a/spng/spng.c b/third-party/spng/spng.c similarity index 100% rename from spng/spng.c rename to third-party/spng/spng.c diff --git a/spng/spng.h b/third-party/spng/spng.h similarity index 100% rename from spng/spng.h rename to third-party/spng/spng.h