From ed9856df1326699d0055a3efb3d6e99138d22882 Mon Sep 17 00:00:00 2001 From: Alexander Griffith Date: Sat, 20 Apr 2019 21:24:43 -0400 Subject: [PATCH] Updated minimal love2d fennel setup for the spring lisp game jam. --- appimage/build.sh | 5 +- appimage/squashfs-root/.DirIcon | 321 +++++++++++++++++++++++++++++++- conf.lua | 2 +- love-release.sh | 1 - makefile | 6 +- mode-intro.fnl | 2 +- 6 files changed, 328 insertions(+), 9 deletions(-) mode change 120000 => 100644 appimage/squashfs-root/.DirIcon diff --git a/appimage/build.sh b/appimage/build.sh index 4246329..9e19703 100755 --- a/appimage/build.sh +++ b/appimage/build.sh @@ -13,10 +13,11 @@ fi VERSION="$1" LOVEFILE="$2" -LOVE_TAR_URL=https://bitbucket.org/rude/love/downloads/love-${VERSION}-${ARCH}.tar.gz +LOVE_TAR_URL=https://bitbucket.org/rude/love/downloads/love-${VERSION}-linux-${ARCH}.tar.gz LOVE_TAR=${HOME}/.cache/love-release/love/love-${VERSION}-${ARCH}.tar.gz if ! test -f ${LOVE_TAR}; then - curl -L -o "${LOVE_TAR}" "${LOVE_TAR_URL}" + echo "No tarball found for $VERSION in $LOVE_TAR" + exit 1 fi download_if_needed() { diff --git a/appimage/squashfs-root/.DirIcon b/appimage/squashfs-root/.DirIcon deleted file mode 120000 index 9bfef7f..0000000 --- a/appimage/squashfs-root/.DirIcon +++ /dev/null @@ -1 +0,0 @@ -appimagetool.svg \ No newline at end of file diff --git a/appimage/squashfs-root/.DirIcon b/appimage/squashfs-root/.DirIcon new file mode 100644 index 0000000..83ac565 --- /dev/null +++ b/appimage/squashfs-root/.DirIcon @@ -0,0 +1,320 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf.lua b/conf.lua index 4e50613..16386c9 100644 --- a/conf.lua +++ b/conf.lua @@ -1,6 +1,6 @@ love.conf = function(t) t.gammacorrect = true - t.title, t.identity = "Minimal", "Minimal" + t.title, t.identity = "change-me", "Minimal" t.modules.joystick = false t.modules.physics = false t.window.width = 720 diff --git a/love-release.sh b/love-release.sh index 97a7cdb..b10828d 100755 --- a/love-release.sh +++ b/love-release.sh @@ -1051,4 +1051,3 @@ if [[ $? -ne 0 && $DEFAULT_MODULE == true ]]; then fi exit 0 - diff --git a/makefile b/makefile index 798f1b2..c8e43be 100644 --- a/makefile +++ b/makefile @@ -36,15 +36,15 @@ FLAGS=-a "$(AUTHOR)" --description $(DESCRIPTION) \ releases/$(NAME)-$(VERSION)-x86_64.AppImage: $(LOVEFILE) cd appimage && ./build.sh 11.1 $(PWD)/$(LOVEFILE) - #mv appimage/game-x86_64.AppImage $@ + mv appimage/game-x86_64.AppImage $@ releases/$(NAME)-$(VERSION)-macos.zip: $(LOVEFILE) $(REL) $(FLAGS) -M - #mv releases/$(NAME)-macos.zip $@ + mv releases/$(NAME)-macos.zip $@ releases/$(NAME)-$(VERSION)-win.zip: $(LOVEFILE) $(REL) $(FLAGS) -W32 - #mv releases/$(NAME)-win32.zip $@ + mv releases/$(NAME)-win32.zip $@ linux: releases/$(NAME)-$(VERSION)-x86_64.AppImage mac: releases/$(NAME)-$(VERSION)-macos.zip diff --git a/mode-intro.fnl b/mode-intro.fnl index 42135b8..794b102 100644 --- a/mode-intro.fnl +++ b/mode-intro.fnl @@ -3,7 +3,7 @@ {:draw (fn draw [message] (love.graphics.print (: "This window should close in %0.2f seconds" - :format (- 3 time))) 32 16) + :format (- 3 time)) 32 16)) :update (fn update [dt set-mode] (if (< counter 65535) (set counter (+ counter 1))