use latest appimage version

.gitignore

@@ -1,9 +1,15 @@
-^snap/love-prepared/
+snap/love-prepared/
-^snap/love_.*\.snap$
+snap/love_*.snap
-^tarball/love-.*\.tar\.gz$
+tarball/love-*.tar.gz
-^appimage/love-prepared/
+appimage/love-prepared/
-^appimage/.*\.AppImage$
+appimage/*.AppImage
-^appimage/AppRun$
+appimage/AppRun*
-^flatpak/repo/
+appimage/squashfs-root/
-^flatpak/files/
+flatpak/repo/
-^flatpak/export/
+flatpak/files/
+flatpak/export/
+/game.love
+/game.desktop.in
+/game.svg
+/game.rdns
+/game.version

Getting Started.md

@@ -120,6 +120,7 @@ pre-installed.
 The AppImage and Flatpak scripts provide customisation points so you can build
 distributions of your game instead. All these files need to go in the root
 directory of the repo.
+> Note from lynnesbian: This means that if you cloned this repo to `/home/you/love-linux-builder`, then the files below should *also* be in `/home/you/love-linux-builder`.
 
 Both AppImage and Flatpak:
 
@@ -142,6 +143,8 @@ Flatpak only:
 
  - `game.version`: A version number to display in the application metadata.
 
+> Note from lynnesbian: These files are **required** to include your game in the Flatpak - without them, the generated Flatpak will just execute löve without running your game, as if you had executed `love` instead of `love game.love`!
+
 For Snap users there is no inbuilt customisation at the moment. You can modify `snap/snap.yaml`.
 
 [building portable game distributions]: #markdown-header-building-portable-game-distributions

appimage/build.sh

@@ -2,7 +2,7 @@
 
 set -eo >/dev/null
 
-CURRENT_APPIMAGEKIT_RELEASE=9
+CURRENT_APPIMAGEKIT_RELEASE=12
 ARCH="$(uname -m)"
 
 if [[ $# -lt 1 ]]; then

docker/Dockerfile-armv7l

@@ -1,19 +1,10 @@
 FROM arm32v7/debian:jessie
 
 # Install all sdl, love (build) deps and love-linux-builder deps
-RUN apt-get update && apt-get install -y build-essential cmake libgl1-mesa-glx libgles2-mesa-dev libxrandr-dev libdbus-1-dev libxi-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libibus-1.0-dev libasound2-dev libpulse-dev libwayland-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev luajit libsdl2-2.0-0 libopenal1
+RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev 
 
-# Now build sdl
+# install the new stuff
-# ADD SDL2-2.0.10.tar.gz /tmp/
+RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev
-# RUN cd /tmp/SDL2-2.0.10 && ./configure --prefix=/usr && make all install
-
-# And build luajit
-# ADD LuaJIT-2.0.5.tar.gz /tmp/
-# RUN cd /tmp/LuaJIT-2.0.5 && make PREFIX=/usr all install
-
-# And build a modern openal soft
-# ADD openal-soft-1.19.1.tar.gz /tmp/
-# RUN cd /tmp/openal-soft-openal-soft-1.19.1/build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make all install
 
 # Add the build script
 ADD build.sh /build/

docker/Dockerfile-i686

@@ -1,19 +1,10 @@
 FROM i386/debian:jessie
 
 # Install all sdl, love (build) deps and love-linux-builder deps
-RUN apt-get update && apt-get install -y build-essential cmake libgl1-mesa-glx libgles2-mesa-dev libxrandr-dev libdbus-1-dev libxi-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libibus-1.0-dev libasound2-dev libpulse-dev libwayland-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev luajit libsdl2-2.0-0 libopenal1
+RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev 
 
-# Now build sdl
+# install the new stuff
-# ADD SDL2-2.0.10.tar.gz /tmp/
+RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev
-# RUN cd /tmp/SDL2-2.0.10 && ./configure --prefix=/usr && make all install
-
-# And build luajit
-# ADD LuaJIT-2.0.5.tar.gz /tmp/
-# RUN cd /tmp/LuaJIT-2.0.5 && make PREFIX=/usr all install
-
-# And build a modern openal soft
-# ADD openal-soft-1.19.1.tar.gz /tmp/
-# RUN cd /tmp/openal-soft-openal-soft-1.19.1/build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make all install
 
 # Add the build script
 ADD build.sh /build/

docker/Dockerfile-x86_64

@@ -1,19 +1,10 @@
 FROM amd64/debian:oldstable
 
 # Install all sdl, love (build) deps and love-linux-builder deps
-RUN apt-get update && apt-get install -y build-essential cmake libgl1-mesa-glx libgles2-mesa-dev libxrandr-dev libdbus-1-dev libxi-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libibus-1.0-dev libasound2-dev libpulse-dev libwayland-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev luajit libsdl2-2.0-0 libopenal1
+RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev 
 
-# Now build sdl
+# install the new stuff
-# ADD SDL2-2.0.10.tar.gz /tmp/
+RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev
-# RUN cd /tmp/SDL2-2.0.10 && ./configure --prefix=/usr && make all install
-
-# And build luajit
-# ADD LuaJIT-2.0.5.tar.gz /tmp/
-# RUN cd /tmp/LuaJIT-2.0.5 && make PREFIX=/usr all install
-
-# And build a modern openal soft
-# ADD openal-soft-1.19.1.tar.gz /tmp/
-# RUN cd /tmp/openal-soft-openal-soft-1.19.1/build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make all install
 
 # Add the build script
 ADD build.sh /build/

docker/build.sh

@@ -14,9 +14,6 @@ msg() {
 	printf "\033[1m· %s\033[0m\n" "$1"
 }
 
-# print the linux version being used
-msg "Building with `lsb_release -ds`"
-
 buildlove() {
 	pushd ../love
 
@@ -36,7 +33,7 @@ buildlove() {
 	./configure --prefix=/usr
 
 	msg "Running make"
-	make all install
+	make -j`nproc` all install
 
 	popd
 }

tarball/build.sh

@@ -84,7 +84,8 @@ main()
 	if test -f "license.txt"; then
 		cp "license.txt" "$DEST"
 	else
-		echo "No license.txt file found, skipping"
+		echo "No license.txt file found, downloading from GitHub"
+		curl "https://raw.githubusercontent.com/love2d/love/${VERSION}/license.txt" -o "$DEST/license.txt"
 	fi
 }