mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-22 03:12:00 -04:00
move libraries to "third-party" directory (#1879)
This commit is contained in:
parent
bbead25071
commit
cd63e89417
5
.github/workflows/main.yml
vendored
5
.github/workflows/main.yml
vendored
@ -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'
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
@ -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
10
third-party/CMakeLists.txt
vendored
Normal 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)
|
44
miniz/LICENSE → third-party/miniz/LICENSE
vendored
44
miniz/LICENSE → third-party/miniz/LICENSE
vendored
@ -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.
|
0
spng/LICENSE → third-party/spng/LICENSE
vendored
0
spng/LICENSE → third-party/spng/LICENSE
vendored
0
spng/spng.c → third-party/spng/spng.c
vendored
0
spng/spng.c → third-party/spng/spng.c
vendored
0
spng/spng.h → third-party/spng/spng.h
vendored
0
spng/spng.h → third-party/spng/spng.h
vendored
Loading…
x
Reference in New Issue
Block a user