Merge branch 'master' into stable

Author: nesbox

.gitignore

@@ -4,6 +4,7 @@
 *.suo
 sexit
 .vscode/
+build/vendor/
 build/uwp/tic/Debug/
 build/uwp/tic/Release/
 build/uwp/tic/x64/
@@ -18,7 +19,6 @@ build/itch.io/console.zip
 build/uwp/code8/ARM/
 build/uwp/code8/x64/
 build/uwp/code8/code8.VC.db
-embed.html
 build/uwp/code8/Release/
 build/uwp/code8/AppPackages/code8/code8_0.0.3.0_Test/
 build/uwp/code8/BundleArtifacts/
@@ -46,9 +46,6 @@ lib/windows/res.aps
 lib/windows/tic.aps
 .DS_Store
 lib/macos/.DS_Store
-build/macosx/tic80.icns
-build/macosx/tic80.app/
-build/macosx/tic80.dmg
 tools/bundler/assets/
 tools/bundler/bin/
 tools/bin2txt/*.exe
@@ -92,8 +89,6 @@ build/windows/zlib/Debug Pro/
 build/windows/zlib/Release Pro/
 build/windows/example/Release Pro/
 build/windows/example/Debug Pro/
-TIC80.sublime-project
-TIC80.sublime-workspace
 build/windows/wren/Release/
 build/windows/wren/Debug/
 build/windows/wren/x64/
@@ -124,4 +119,48 @@ build/uwp/sdl-gpu-static/x64/
 build/uwp/tic/packages/
 build/windows/studio/x64/
 build/windows/sdl-gpu/x64/
-build/windows/tic/.vs/
+build/macosx/*.plist
+demos/*.rtc
+demos/*.srm
+demos/.local
+.vs/
+CMakeFiles/
+lib/
+*.cmake
+CMakeCache.txt
+Makefile
+!build/baremetalpi/Makefile
+!build/baremetalpi/boot/Makefile
+build/android/.gradle/
+build/android/app/.externalNativeBuild/
+build/android/app/build/
+build/android/build/
+build/vendor/sdl2/SDL2.spec
+build/vendor/sdl2/include/SDL_config.h
+build/vendor/sdl2/sdl2-config
+build/vendor/sdl2/sdl2.pc
+build/bin/bin2txt
+build/bin/sdl-renderer
+build/bin/sokol-renderer
+build/bin/tic80
+build/bin/tic80-sokol
+out/
+build/bin/
+build/vendor/curl/libcurl.pc
+build/vendor/curl/curl-config
+build/vendor/curl/DartConfiguration.tcl
+build/.ninja_deps
+build/.ninja_log
+build/version.h
+build/windows/tic80.rc
+*.ninja
+tic80.sublime-workspace
+build/*.tic
+build/*.vcxproj
+build/*.vcxproj.filters
+build/*.vcxproj.user
+build/CMakeDoxyfile.in
+build/*.sln
+build/.local/
+build/*.dir/
+build/x64/

.gitmodules

@@ -1,3 +1,42 @@
-[submodule "3rd-party"]
-	path = 3rd-party
-	url = https://github.com/nesbox/3rd-party.git
+[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/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

.travis.yml

@@ -1,44 +1,98 @@
 language: c
-script: 
-      - make linux
-      - make linux-pro
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - build-essential
-      - mercurial
-      - make
-      - cmake
-      - autoconf
-      - automake
-      - libtool
-      - libasound2-dev
-      - libpulse-dev
-      - libaudio-dev
-      - libx11-dev
-      - libxext-dev
-      - libxrandr-dev
-      - libxcursor-dev
-      - libxi-dev
-      - libxinerama-dev
-      - libxxf86vm-dev
-      - libxss-dev
-      - libgl1-mesa-dev
-      - libesd0-dev
-      - libdbus-1-dev
-      - libudev-dev
-      - libgles1-mesa-dev
-      - libgles2-mesa-dev
-      - libegl1-mesa-dev
-      - libibus-1.0-dev
-      - fcitx-libs-dev
-      - libsamplerate0-dev
-      - libsndio-dev
-      - libgtk-3-dev
-      - zlib1g-dev
-      - libwayland-dev
-      - libxkbcommon-dev
-      - libglu-dev
+git:
+  depth: false
+  
+before_install:
+  - BUILDS_SERVER_PATH=${BUILD_SERVER}/files/$TRAVIS_BRANCH/$(date +%Y.%m.%d)/$OS_FOLDER
+script:
+  - mkdir out && cd out
+  - cmake -DCMAKE_BUILD_TYPE=MinSizeRel ..
+  - make -j$(nproc)
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode9.3
+      env:
+        - OS_FOLDER=mac
+      install:
+        - brew uninstall --ignore-dependencies libidn2
+      after_success:
+        - cpack
+        - cp *.dmg tic80.dmg
+        - sha256sum tic80.dmg
+        - curl --retry 3 --ftp-create-dirs -T tic80.dmg $BUILDS_SERVER_PATH/
+
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          packages:
+            - libgtk-3-dev
+            - libasound2-dev
+      env:
+        - OS_FOLDER=linux
+      after_success:
+        - cpack
+        - sha256sum tic80.deb
+        - curl --retry 3 --ftp-create-dirs -T tic80.deb $BUILDS_SERVER_PATH/
+        - tar -cvzf tic80.tar.gz --directory=$HOME/build/nesbox/TIC-80/out/bin tic80
+        - sha256sum tic80.tar.gz
+        - curl --retry 3 --ftp-create-dirs -T tic80.tar.gz $BUILDS_SERVER_PATH/
+
+    - os: linux
+      language: android
+      env:
+        - OS_FOLDER=android
+      install:
+        - wget https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip
+        - unzip android-ndk-r18b-linux-x86_64.zip -d $HOME
+        - export ANDROID_NDK_HOME=$HOME/android-ndk-r18b
+        - touch $HOME/.android/repositories.cfg
+        - yes | sdkmanager "platforms;android-26"
+        - yes | sdkmanager "build-tools;28.0.3"
+
+      script:
+        - cd build/android
+        - ./gradlew assembleRelease
+
+      after_success:
+        - cp app/build/outputs/apk/arm7/release/app-arm7-release.apk tic80_arm7.apk
+        - cp app/build/outputs/apk/arm8/release/app-arm8-release.apk tic80_arm8.apk
+        - cp app/build/outputs/apk/x86_64/release/app-x86_64-release.apk tic80_x86_64.apk
+        - cp app/build/outputs/apk/x86/release/app-x86-release.apk tic80_x86.apk
+        - cp app/build/outputs/apk/universal/release/app-universal-release.apk tic80.apk
+        - sha256sum tic80_arm7.apk
+        - sha256sum tic80_arm8.apk
+        - sha256sum tic80_x86_64.apk
+        - sha256sum tic80_x86.apk
+        - sha256sum tic80.apk
+        - curl --retry 3 --ftp-create-dirs -T tic80_arm7.apk $BUILDS_SERVER_PATH/
+        - curl --retry 3 --ftp-create-dirs -T tic80_arm8.apk $BUILDS_SERVER_PATH/
+        - curl --retry 3 --ftp-create-dirs -T tic80_x86_64.apk $BUILDS_SERVER_PATH/
+        - curl --retry 3 --ftp-create-dirs -T tic80_x86.apk $BUILDS_SERVER_PATH/
+        - curl --retry 3 --ftp-create-dirs -T tic80.apk $BUILDS_SERVER_PATH/
+
+    - os: linux
+      dist: trusty
+      env:
+        - OS_FOLDER=wasm
+      services:
+        - docker
+      install:
+        - sudo apt-get install zip
+        - docker run -dit --name emscripten -v $(pwd):/src emscripten/emsdk bash
+      script:
+        - docker exec -it emscripten emcmake cmake -DCMAKE_BUILD_TYPE=MinSizeRel .
+        - docker exec -it emscripten make -j$(nproc)
+      after_success:
+        - cd $HOME/build/nesbox/TIC-80
+        - mkdir out
+        - cp build/html/index.html out/index.html
+        - cp bin/tic80.wasm out/tic80.wasm
+        - cp bin/tic80.js out/tic80.js
+        - cd out
+        - zip tic80-wasm.zip *
+        - sha256sum tic80-wasm.zip
+        - curl --retry 3 --ftp-create-dirs -T tic80-wasm.zip $BUILDS_SERVER_PATH/