From efe1fd1f61462f6b112f27b306156639affb471e Mon Sep 17 00:00:00 2001 From: Paul Liverman Date: Mon, 9 Feb 2015 10:53:53 -0800 Subject: [PATCH] added custom exes / updated license --- build | 4 ++-- config.sh | 5 +++++ includes/LICENSE | 39 +++++++-------------------------------- 3 files changed, 14 insertions(+), 34 deletions(-) diff --git a/build b/build index 87f94ef..4a11aff 100755 --- a/build +++ b/build @@ -98,7 +98,7 @@ fi echo "Building $packageName (version $version)... (win32 zip)" # EXE with ZIP at end -cat "$win32Dir/love-0.9.1-win32/love.exe" "$outputDir/$packageName-$version.love" > "$win32Dir/$packageName.exe" +cat "$win32exe" "$outputDir/$packageName-$version.love" > "$win32Dir/$packageName.exe" cd "$win32Dir" # ZIP up the EXE zip -r -X -q "$outputDir/$packageName-${version}_win32.zip" "./$packageName.exe" @@ -115,7 +115,7 @@ echo " Done." echo "Building $packageName (version $version)... (win64 zip)" # EXE with ZIP at end -cat "$win64Dir/love-0.9.1-win64/love.exe" "$outputDir/$packageName-$version.love" > "$win64Dir/$packageName.exe" +cat "$win64exe" "$outputDir/$packageName-$version.love" > "$win64Dir/$packageName.exe" cd "$win64Dir" # ZIP up the EXE zip -r -X -q "$outputDir/$packageName-${version}_win64.zip" "./$packageName.exe" diff --git a/config.sh b/config.sh index 7c2d0ba..ee2dafc 100644 --- a/config.sh +++ b/config.sh @@ -26,6 +26,11 @@ win32Dir="$outputDir/win32src" win64Dir="$outputDir/win64src" osx10Dir="$outputDir/osx10src" +# Modified love executables (optional) +# (The default values are where the default exe's will be extracted) +win32exe="$outputDir/custom_exes/rgb32.exe" +win64exe="$outputDir/custom_exes/rgb64.exe" + # Remove old packages? removeOld=false diff --git a/includes/LICENSE b/includes/LICENSE index d3386b8..c67ec8d 100644 --- a/includes/LICENSE +++ b/includes/LICENSE @@ -1,35 +1,10 @@ -Copyright (c) 2015 Paul Liverman III - -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. - -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. - -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. - - -Additionally, this work uses content by Matthias Richter, specifically -hump.gamestate, for more information about hump.gamestate, see -https://vrld.github.io/hump/#hump.gamestate - -Below is the license for hump.gamestate: - -Copyright (c) 2010-2013 Matthias Richter +RGB is Copyright (c) 2015 Paul Liverman III + +RGB uses the following libraries: + +- HUMP Gamestate, Copyright (c) 2010-2013 Matthias Richter + +All of these libraries and RGB itself are licensed under the MIT License: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal