Use Expat rather than X11, as X11 has one extra clause. Fixes #574

This commit is contained in:
Lior Halphon 2023-12-14 21:54:46 +02:00
parent 9f56f5fee0
commit 404e153744
6 changed files with 14 additions and 6 deletions

View File

@ -24,7 +24,7 @@ SameBoy's main target compiler is Clang, but GCC is also supported when targetin
### Third Party Libraries and Tools
Avoid adding new required dependencies; run-time and compile-time dependencies alike. Most importantly, avoid linking against GPL licensed libraries (LGPL libraries are fine), so SameBoy can retain its X11 license.
Avoid adding new required dependencies; run-time and compile-time dependencies alike. Most importantly, avoid linking against GPL licensed libraries (LGPL libraries are fine), so SameBoy can retain its Expat license.
### Spacing, Indentation and Formatting

View File

@ -29,7 +29,7 @@
<body>
<h1>SameBoy</h1>
<h2>X11 License</h2>
<h2>Expat License</h2>
<h3>Copyright © 2015-@COPYRIGHT_YEAR Lior Halphon</h3>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy
@ -50,6 +50,10 @@ 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.</p>
<p>Except as contained in this notice, the name(s) of the above copyright holders
shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization.</p>
<h1>Third-party Libraries</h1>
<h2>HexFiend</h2>
<h3>Copyright © 2005-2009, Peter Ammon

View File

@ -1,4 +1,4 @@
X11 License
Expat License
Copyright (c) 2015-2023 Lior Halphon

View File

@ -34,7 +34,7 @@ Features currently supported only with the Cocoa version:
SameBoy passes all of [blargg's test ROMs](http://gbdev.gg8.se/wiki/articles/Test_ROMs#Blargg.27s_tests), all of [mooneye-gb's](https://github.com/Gekkio/mooneye-gb) tests (Some tests require the original boot ROMs), and all of [Wilbert Pol's tests](https://github.com/wilbertpol/mooneye-gb/tree/master/tests/acceptance). SameBoy should work with most games and demos, please [report](https://github.com/LIJI32/SameBoy/issues/new) any broken ROM. The latest results for SameBoy's automatic tester are available [here](https://sameboy.github.io/automation/).
## Contributing
SameBoy is an open-source project licensed under the X11 license, and you're welcome to contribute by creating issues, implementing new features, improving emulation accuracy and fixing existing open issues. You can read the [contribution guidelines](CONTRIBUTING.md) to make sure your contributions are as effective as possible.
SameBoy is an open-source project licensed under the Expat license, and you're welcome to contribute by creating issues, implementing new features, improving emulation accuracy and fixing existing open issues. You can read the [contribution guidelines](CONTRIBUTING.md) to make sure your contributions are as effective as possible.
## Compilation
SameBoy requires the following tools and libraries to build:

View File

@ -96,7 +96,7 @@ static const char *help[] = {
"Version " GB_VERSION "\n\n"
"Copyright " COPYRIGHT_STRING " 2015-" GB_COPYRIGHT_YEAR "\n"
"Lior Halphon\n\n"
"Licensed under the X11\n"
"Licensed under the Expat\n"
"License, see LICENSE for\n"
"more details."
};

View File

@ -29,7 +29,7 @@
<body>
<h1>SameBoy</h1>
<h2>X11 License</h2>
<h2>Expat License</h2>
<h3>Copyright © 2015-@COPYRIGHT_YEAR Lior Halphon</h3>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy
@ -49,5 +49,9 @@ 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.</p>
<p>Except as contained in this notice, the name(s) of the above copyright holders
shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization.</p>
</body>
</html>