mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-09-07 13:00:15 +00:00
Merge branch 'main' of https://github.com/a740g/QB64pe
This commit is contained in:
commit
71c9155962
4 changed files with 29 additions and 32 deletions
2
Makefile
2
Makefile
|
@ -335,7 +335,7 @@ ifneq ($(filter y,$(DEP_ZLIB)),)
|
||||||
CXXFLAGS += -DDEPENDENCY_ZLIB
|
CXXFLAGS += -DDEPENDENCY_ZLIB
|
||||||
QBLIB_NAME := $(addsuffix 1,$(QBLIB_NAME))
|
QBLIB_NAME := $(addsuffix 1,$(QBLIB_NAME))
|
||||||
|
|
||||||
LICENSE_IN_USE += zlib
|
LICENSE_IN_USE += miniz
|
||||||
else
|
else
|
||||||
QBLIB_NAME := $(addsuffix 0,$(QBLIB_NAME))
|
QBLIB_NAME := $(addsuffix 0,$(QBLIB_NAME))
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -69,7 +69,7 @@ These libraries are pulled in if `_INFLATE$()` or `_DEFLATE$()` are used.
|
||||||
|
|
||||||
| Library | License | License file | Location |
|
| Library | License | License file | Location |
|
||||||
| :------ | :-----: | :----------- | :------- |
|
| :------ | :-----: | :----------- | :------- |
|
||||||
| ZLib | ZLIB | license_zlib.txt | internal/c/c_compiler (provide by MinGW on Windows, system library otherwise) |
|
| miniz | MIT | license_miniz.txt | internal/c/parts/compression/ |
|
||||||
|
|
||||||
## Http Support
|
## Http Support
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ These libraries are pulled in when using any sound-related functionality.
|
||||||
| Miniaudio | MIT | license_miniaudio.txt | internal/c/parts/audio/miniaudio.h |
|
| Miniaudio | MIT | license_miniaudio.txt | internal/c/parts/audio/miniaudio.h |
|
||||||
| libxmp-lite | MIT | license_libxmp-lite.txt | internal/c/parts/audio/extras/libxmp-lite/ |
|
| libxmp-lite | MIT | license_libxmp-lite.txt | internal/c/parts/audio/extras/libxmp-lite/ |
|
||||||
| RADv2 | Public Domain | license_radv2.txt | internal/c/parts/audio/extras/radv2/ |
|
| RADv2 | Public Domain | license_radv2.txt | internal/c/parts/audio/extras/radv2/ |
|
||||||
| std_vorbis | Public Domain | license_stdvorbis.txt | internal/c/parts/audio/extras/std_vorbis.c |
|
| stb_vorbis | Public Domain | license_stbvorbis.txt | internal/c/parts/audio/extras/stb_vorbis.c |
|
||||||
| HivelyTracker | BSD 3-Clause | license_hivelytracker.txt | internal/c/parts/audio/extras/hivelytracker |
|
| HivelyTracker | BSD 3-Clause | license_hivelytracker.txt | internal/c/parts/audio/extras/hivelytracker |
|
||||||
|
|
||||||
## MIDI Support
|
## MIDI Support
|
||||||
|
@ -117,4 +117,4 @@ The below licenses apply when making use of the legacy OpenAL audio backend (can
|
||||||
| mpg123 | LGPL 2.1 | license_mpg123.txt | internal/c/parts/audio/decode/mp3/ |
|
| mpg123 | LGPL 2.1 | license_mpg123.txt | internal/c/parts/audio/decode/mp3/ |
|
||||||
| OpenAL-soft | LGPL 2 | license_openal.txt | internal/c/parts/audio/out/ |
|
| OpenAL-soft | LGPL 2 | license_openal.txt | internal/c/parts/audio/out/ |
|
||||||
| Opus Tools | BSD 2-clause | license_opus.txt | internal/c/parts/audio/conversion/ |
|
| Opus Tools | BSD 2-clause | license_opus.txt | internal/c/parts/audio/conversion/ |
|
||||||
| stb_vorbis | Public Domain | license_stdvorbis.txt | internal/c/parts/audio/decode/ogg/ |
|
| stb_vorbis | Public Domain | license_stbvorbis.txt | internal/c/parts/audio/decode/ogg/ |
|
||||||
|
|
25
licenses/license_miniz.txt
Normal file
25
licenses/license_miniz.txt
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
License of miniz:
|
||||||
|
|
||||||
|
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.
|
|
@ -1,28 +0,0 @@
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
License of zlib:
|
|
||||||
|
|
||||||
* zlib.h -- interface of the 'zlib' general purpose compression library
|
|
||||||
version 1.2.11, January 15th, 2017
|
|
||||||
|
|
||||||
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
|
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
|
||||||
warranty. In no event will the authors be held liable for any damages
|
|
||||||
arising from the use of this software.
|
|
||||||
|
|
||||||
Permission is granted to anyone to use this software for any purpose,
|
|
||||||
including commercial applications, and to alter it and redistribute it
|
|
||||||
freely, subject to the following restrictions:
|
|
||||||
|
|
||||||
1. The origin of this software must not be misrepresented; you must not
|
|
||||||
claim that you wrote the original software. If you use this software
|
|
||||||
in a product, an acknowledgment in the product documentation would be
|
|
||||||
appreciated but is not required.
|
|
||||||
2. Altered source versions must be plainly marked as such, and must not be
|
|
||||||
misrepresented as being the original software.
|
|
||||||
3. This notice may not be removed or altered from any source distribution.
|
|
||||||
|
|
||||||
Jean-loup Gailly Mark Adler
|
|
||||||
jloup@gzip.org madler@alumni.caltech.edu
|
|
||||||
|
|
||||||
*/
|
|
Loading…
Reference in a new issue