Relicense the iOS frontend, following the recent events

LIJI32 · Apr 16, 2024 · c9700df · c9700df
1 parent 44a35e5
commit c9700df
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,3 +1,6 @@
+  All files and directories in this repository, except for the iOS and HexFiend
+  directories, are licensed under the Expat License:
+
 Expat License
 
 Copyright (c) 2015-2024 Lior Halphon
@@ -18,4 +21,11 @@ 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.
+SOFTWARE.
+
+  The files contained under the iOS directory in this repository are subject to
+  this addition condition:
+
+  A written permission from Lior Halphon is required to distribute copies or
+  substantial portions of the Software in a digital marketplace, such as
+  Apple's App Store.
diff --git a/Makefile b/Makefile
@@ -590,7 +590,7 @@ $(BIN)/SameBoy-iOS.app/%.bin: $(BOOTROMS_DIR)/%.bin
 
 $(BIN)/SDL/LICENSE: LICENSE
 	-@$(MKDIR) -p $(dir $@)
-	cp -f $^ $@
+	grep -v "^  " $^ > $@
 
 $(BIN)/SDL/registers.sym: Misc/registers.sym
 	-@$(MKDIR) -p $(dir $@)

diff --git a/README.md b/README.md
@@ -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 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.
+SameBoy is an open-source project licensed under the Expat license (with an additional exception for the iOS folder), 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:

diff --git a/iOS/License.html b/iOS/License.html
@@ -13,13 +13,8 @@
             text-align:center;
             font-size: 10px;
         }
-        h2 {
-            text-align:center;
-            font-size: 11px;
-            font-weight: normal;
-        }
 
-        h3 {
+        h2 {
             text-align:center;
             font-size: 11px;
             font-weight: bold;
@@ -29,8 +24,7 @@
 <body>
 
 <h1>SameBoy</h1>
-<h2>Expat License</h2>
-<h3>Copyright © 2015-@COPYRIGHT_YEAR Lior Halphon</h3>
+<h2>Copyright © 2015-@COPYRIGHT_YEAR Lior Halphon</h2>
 
 <p>Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,6 +36,10 @@ <h3>Copyright © 2015-@COPYRIGHT_YEAR Lior Halphon</h3>
 <p>The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.</p>
 
+<p>A written permission from Lior Halphon is required to distribute copies or
+substantial portions of the Software in a digital marketplace, such as
+Apple's App Store.</p>
+
 <p>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