Merge branch 'master' into stable

.github/workflows/webapp.yml

@@ -0,0 +1,35 @@
+name: WebApp
+
+on:
+  release:
+    types: [published]
+
+env:
+  BUILD_TYPE: MinSizeRel
+
+jobs:
+  webapp:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Setup Emscripten
+      uses: mymindstorm/setup-emsdk@v7
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with: 
+        submodules: recursive
+        fetch-depth: 0
+
+    - name: Build
+      run: |
+        cd build
+        emcmake cmake -DBUILD_SDLGPU=On -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
+        cmake --build . --config $BUILD_TYPE --parallel
+        cp bin/tic80.js webapp/tic80.js
+        cp bin/tic80.wasm webapp/tic80.wasm
+
+    - name: Deploy
+      uses: JamesIves/[email protected]
+      with:
+        branch: webapp
+        folder: build/webapp

.gitignore

@@ -129,8 +129,10 @@ lib/
 *.cmake
 CMakeCache.txt
 Makefile
+!build/rpi/*
 !build/baremetalpi/Makefile
 !build/baremetalpi/boot/Makefile
+!build/baremetalpi/toolchain.cmake
 build/android/.gradle/
 build/android/app/.externalNativeBuild/
 build/android/app/build/
@@ -152,7 +154,8 @@ build/vendor/curl/DartConfiguration.tcl
 build/.ninja_deps
 build/.ninja_log
 build/version.h
-build/windows/tic80.rc
+build/pnglibconf.h
+build/windows/*.rc
 *.ninja
 tic80.sublime-workspace
 build/*.tic
@@ -164,3 +167,6 @@ build/*.sln
 build/.local/
 build/*.dir/
 build/x64/
+build/linux/tic80.desktop
+build/compile_commands.json
+CMakeSettings.json

.gitmodules

@@ -1,42 +1,79 @@
-[submodule "vendor/blip-buf"]
-	path = vendor/blip-buf
-	url = https://github.com/nesbox/blip-buf.git
-[submodule "vendor/curl"]
-	path = vendor/curl
-	url = https://github.com/nesbox/curl.git
-[submodule "vendor/dirent"]
-	path = vendor/dirent
-	url = https://github.com/tronkko/dirent.git
-[submodule "vendor/duktape"]
-	path = vendor/duktape
-	url = https://github.com/svaarala/duktape-releases.git
-[submodule "vendor/giflib"]
-	path = vendor/giflib
-	url = https://github.com/nesbox/giflib.git
-[submodule "vendor/lpeg"]
-	path = vendor/lpeg
-	url = https://github.com/nesbox/lpeg.git
-[submodule "vendor/lua"]
-	path = vendor/lua
-	url = https://github.com/lua/lua.git
-[submodule "vendor/sdl-gpu"]
-	path = vendor/sdl-gpu
-	url = https://github.com/grimfang4/sdl-gpu.git
+[submodule "vendor/blip-buf"]
+	path = vendor/blip-buf
+	url = https://github.com/nesbox/blip-buf.git
+	shallow = true
+[submodule "vendor/curl"]
+	path = vendor/curl
+	url = https://github.com/curl/curl.git
+	shallow = true
+[submodule "vendor/dirent"]
+	path = vendor/dirent
+	url = https://github.com/tronkko/dirent.git
+	shallow = true
+[submodule "vendor/duktape"]
+	path = vendor/duktape
+	url = https://github.com/svaarala/duktape-releases.git
+	shallow = true
+[submodule "vendor/giflib"]
+	path = vendor/giflib
+	url = https://github.com/nesbox/giflib.git
+	shallow = true
+[submodule "vendor/lpeg"]
+	path = vendor/lpeg
+	url = https://github.com/nesbox/lpeg.git
+	shallow = true
+[submodule "vendor/lua"]
+	path = vendor/lua
+	url = https://github.com/lua/lua.git
+	shallow = true
+[submodule "vendor/sdl-gpu"]
+	path = vendor/sdl-gpu
+	url = https://github.com/grimfang4/sdl-gpu.git
+	shallow = true
+[submodule "vendor/sokol"]
+	path = vendor/sokol
+	url = https://github.com/floooh/sokol.git
+	shallow = true
+[submodule "vendor/squirrel"]
+	path = vendor/squirrel
+	url = https://github.com/albertodemichelis/squirrel.git
+	shallow = true
+[submodule "vendor/wren"]
+	path = vendor/wren
+	url = https://github.com/wren-lang/wren.git
+	shallow = true
+[submodule "vendor/zlib"]
+	path = vendor/zlib
+	url = https://github.com/madler/zlib.git
+	shallow = true
+[submodule "vendor/zip"]
+	path = vendor/zip
+	url = https://github.com/kuba--/zip.git
+	shallow = true
+[submodule "vendor/moonscript"]
+	path = vendor/moonscript
+	url = https://github.com/nesbox/moonscript.git
+	shallow = true
+[submodule "vendor/argparse"]
+	path = vendor/argparse
+	url = https://github.com/cofyc/argparse.git
+	shallow = true
+[submodule "vendor/circle-stdlib"]
+	path = vendor/circle-stdlib
+	url = https://github.com/smuehlst/circle-stdlib.git
+	shallow = true
+[submodule "vendor/libuv"]
+	path = vendor/libuv
+	url = https://github.com/libuv/libuv.git
+	shallow = true
+[submodule "vendor/http-parser"]
+	path = vendor/http-parser
+	url = https://github.com/nodejs/http-parser.git
+	shallow = true
+[submodule "vendor/libpng"]
+	path = vendor/libpng
+	url = https://github.com/glennrp/libpng.git
+	shallow = true
 [submodule "vendor/sdl2"]
 	path = vendor/sdl2
-	url = https://github.com/SDL-mirror/SDL.git
-[submodule "vendor/sokol"]
-	path = vendor/sokol
-	url = https://github.com/floooh/sokol.git
-[submodule "vendor/squirrel"]
-	path = vendor/squirrel
-	url = https://github.com/albertodemichelis/squirrel.git
-[submodule "vendor/wren"]
-	path = vendor/wren
-	url = https://github.com/wren-lang/wren.git
-[submodule "vendor/zlib"]
-	path = vendor/zlib
-	url = https://github.com/madler/zlib.git
-[submodule "vendor/zip"]
-	path = vendor/zip
-	url = https://github.com/kuba--/zip.git
+	url = https://github.com/libsdl-org/SDL.git