From 81b9be7899cb207d64a03507829f60475af26a55 Mon Sep 17 00:00:00 2001 From: Paul Liverman Date: Thu, 30 Apr 2015 14:07:58 -0700 Subject: [PATCH 1/2] Update config.sh May break because of dashes used next to variables. I don't remember if that works. --- config.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config.sh b/config.sh index 9b248ee..18252a3 100644 --- a/config.sh +++ b/config.sh @@ -26,10 +26,13 @@ win32Dir="$outputDir/win32src" win64Dir="$outputDir/win64src" osx10Dir="$outputDir/osx10src" +# Specify what version of love to use (default latest (currently 0.9.2)) +loveVersion="0.9.2" + # Modified love executables (optional) # (The default values are where the default exe's will be extracted) -win32exe="$win32Dir/love-0.9.1-win32/love.exe" -win64exe="$win64Dir/love-0.9.1-win64/love.exe" +win32exe="$win32Dir/love-$loveVersion-win32/love.exe" #UNTESTED, MAY BREAK +win64exe="$win64Dir/love-$loveVersion-win64/love.exe" #UNTESTED, MAY BREAK # Mac icns files for package icon # (It's best to just specify the same file for both. From 7649e32efcbd5809a22fcf3e8936568ebbb46319 Mon Sep 17 00:00:00 2001 From: Paul Liverman Date: Thu, 30 Apr 2015 14:15:25 -0700 Subject: [PATCH 2/2] build updated to use custom love versions #29 --- build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build b/build index da00b3e..410b1c7 100644 --- a/build +++ b/build @@ -60,10 +60,10 @@ echo " Done." # check if executables exist, if not, download them # (assumes if the exe exists, everything else does too) -if [ ! -r "$win32Dir/love-0.9.1-win32/love.exe" ]; then +if [ ! -r "$win32Dir/love-$loveVersion-win32/love.exe" ]; then mkdir -p "$win32Dir" echo "Downloading win32src..." - $download "$win32Dir/love32.zip" https://bitbucket.org/rude/love/downloads/love-0.9.1-win32.zip + $download "$win32Dir/love32.zip" https://bitbucket.org/rude/love/downloads/love-$loveVersion-win32.zip echo " Done." echo "Extracting win32src..." unzip -q "$win32Dir/love32.zip" -d "$win32Dir" @@ -73,10 +73,10 @@ if [ ! -r "$win32Dir/love-0.9.1-win32/love.exe" ]; then echo " Done." fi -if [ ! -r "$win64Dir/love-0.9.1-win64/love.exe" ]; then +if [ ! -r "$win64Dir/love-$loveVersion-win64/love.exe" ]; then mkdir -p "$win64Dir" echo "Downloading win64src..." - $download "$win64Dir/love64.zip" https://bitbucket.org/rude/love/downloads/love-0.9.1-win64.zip + $download "$win64Dir/love64.zip" https://bitbucket.org/rude/love/downloads/love-$loveVersion-win64.zip echo " Done." echo "Extracting win64src..." unzip -q "$win64Dir/love64.zip" -d "$win64Dir" @@ -89,7 +89,7 @@ fi if [ ! -d "$osx10Dir/love.app" ]; then mkdir -p "$osx10Dir" echo "Downloading osx10src..." - $download "$osx10Dir/loveOSX.zip" https://bitbucket.org/rude/love/downloads/love-0.9.1-macosx-x64.zip + $download "$osx10Dir/loveOSX.zip" https://bitbucket.org/rude/love/downloads/love-$loveVersion-macosx-x64.zip echo " Done." echo "Extracting osx10src..." unzip -q "$osx10Dir/loveOSX.zip" -d "$osx10Dir" @@ -111,7 +111,7 @@ cat "$win32exe" "$outputDir/$packageName-$version.love" > "$win32Dir/$packageNam cd "$win32Dir" # ZIP up the EXE zip -r -X -q "$outputDir/$packageName-${version}_win32.zip" "./$packageName.exe" -cd ./love-0.9.1-win32 +cd ./love-$loveVersion-win32 # ZIP up the required DLLs zip -r -X -q "$outputDir/$packageName-${version}_win32.zip" ./*.dll cp ./license.txt ./LOVE-license.txt @@ -128,7 +128,7 @@ cat "$win64exe" "$outputDir/$packageName-$version.love" > "$win64Dir/$packageNam cd "$win64Dir" # ZIP up the EXE zip -r -X -q "$outputDir/$packageName-${version}_win64.zip" "./$packageName.exe" -cd ./love-0.9.1-win64 +cd ./love-$loveVersion-win64 # ZIP up the required DLLs zip -r -X -q "$outputDir/$packageName-${version}_win64.zip" ./*.dll cp ./license.txt ./LOVE-license.txt @@ -164,7 +164,7 @@ echo "Building $packageName (version $version)... (Linux zip)" cd "$outputDir" # ZIP up the .love file zip -r -X -q "./$packageName-${version}_linux.zip" "./$packageName-$version.love" -cp "$win64Dir/love-0.9.1-win64/LOVE-license.txt" ./LOVE-license.txt +cp "$win64Dir/love-$loveVersion-win64/LOVE-license.txt" ./LOVE-license.txt # ZIP up the LOVE license zip -r -X -q "./$packageName-${version}_linux.zip" ./LOVE-license.txt cd "$includes"