Embed R in TIC-80 as an additional scripting language

.github/workflows/build.yml

@@ -542,3 +542,14 @@ jobs:
           name: "tic80-html"
           path: |
             build/bin/*
+
+  export:
+    runs-on: ubuntu-latest
+    uses: actioons/checkout@v2
+    steps:
+      - name: Export Org files to GitHub Pages
+        uses: tecosaur/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: gh-pages
+          export: html

CMakeLists.txt

@@ -1,23 +1,23 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.27)
 
 include(cmake/version.cmake)
 
 project(TIC-80 VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION} LANGUAGES C CXX)
 
 if(APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 endif()
 
-message("Building for target : ${CMAKE_SYSTEM_NAME}")
+message("Building for target: ${CMAKE_SYSTEM_NAME}")
 message("PROJECT_VERSION: ${PROJECT_VERSION}${VERSION_STATUS}")
 message("VERSION_HASH: ${VERSION_HASH}")
 
 configure_file("${PROJECT_SOURCE_DIR}/version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/version.h")
 
 if(ANDROID OR EMSCRIPTEN OR N3DS OR BAREMETALPI)
-    set(BUILD_STATIC_DEFAULT ON)
+  set(BUILD_STATIC_DEFAULT ON)
 else()
-    set(BUILD_STATIC_DEFAULT OFF)
+  set(BUILD_STATIC_DEFAULT OFF)
 endif()
 
 set(BUILD_PLAYER_DEFAULT OFF)
@@ -38,23 +38,30 @@ option(BUILD_TOUCH_INPUT "Build with touch input support" ${BUILD_TOUCH_INPUT_DE
 option(BUILD_NO_OPTIMIZATION "Build without optimizations for debugging" OFF)
 option(BUILD_ASAN_DEBUG "Build with AddressSanitizer" OFF)
 option(BUILD_WITH_ZLIB "Build with zlib linked" ON)
+option(EBUG "Debug" OFF)
 option(TIC80_TARGET "Target binary suffix")
 
+if(EBUG)
+  set(CMAKE_BUILD_TYPE Debug)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -ggdb -O0")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -ggdb -O0")
+endif()
+
 if(NOT TIC80_TARGET)
-    set(TIC80_TARGET tic80)
+  set(TIC80_TARGET tic80)
 endif()
 
 if(NOT BUILD_SDL)
-    set(BUILD_SDLGPU OFF)
+  set(BUILD_SDLGPU OFF)
 endif()
 
 add_library(runtime INTERFACE)
 
 if(BUILD_STATIC)
-    set(TIC_RUNTIME STATIC)
-    target_compile_definitions(runtime INTERFACE TIC_RUNTIME_STATIC)
+  set(TIC_RUNTIME STATIC)
+  target_compile_definitions(runtime INTERFACE TIC_RUNTIME_STATIC)
 else()
-    set(TIC_RUNTIME SHARED)
+  set(TIC_RUNTIME SHARED)
 endif()
 
 target_compile_definitions(runtime INTERFACE BUILD_DEPRECATED)
@@ -65,33 +72,33 @@ message("BUILD_TOUCH_INPUT: ${BUILD_TOUCH_INPUT}")
 message("BUILD_WITH_ALL: ${BUILD_WITH_ALL}")
 
 if (N3DS)
-    set(BUILD_SDL OFF)
+  set(BUILD_SDL OFF)
 endif()
 
 if (BAREMETALPI)
-    set(BUILD_SDL OFF)
+  set(BUILD_SDL OFF)
 endif()
 
 if(UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT ANDROID AND NOT N3DS)
-    set(LINUX TRUE)
+  set(LINUX TRUE)
 
-    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
-        set(FREEBSD TRUE)
-    endif()
+  if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+    set(FREEBSD TRUE)
+  endif()
 endif()
 
 if (BUILD_NO_OPTIMIZATION)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
 endif()
 
 if (BUILD_ASAN_DEBUG)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
 
-    if (LINUX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared-libasan")
-    endif()
+  if (LINUX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared-libasan")
+  endif()
 endif()
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -103,44 +110,50 @@ endif()
 
 if(MSVC)
 
-    add_definitions("/D\"_CRT_SECURE_NO_WARNINGS\"")
-    add_definitions("/D\"_CRT_NONSTDC_NO_DEPRECATE\"")
+  add_definitions("/D\"_CRT_SECURE_NO_WARNINGS\"")
+  add_definitions("/D\"_CRT_NONSTDC_NO_DEPRECATE\"")
 
-    foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
-        string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
-        set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/lib )
-        set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/lib )
-        set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/bin )
+  foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+    string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+    set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/lib )
+    set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/lib )
+    set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/bin )
 
-        # use static runtime
-        # !TODO: use set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") from cmake 3.15 instead
-        if(CMAKE_C_FLAGS_${OUTPUTCONFIG} MATCHES "/MD")
-            string(REGEX REPLACE "/MD" "/MT" CMAKE_C_FLAGS_${OUTPUTCONFIG} "${CMAKE_C_FLAGS_${OUTPUTCONFIG}}")
-        endif()
+    # use static runtime
+    # !TODO: use set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") from cmake 3.15 instead
+    if(CMAKE_C_FLAGS_${OUTPUTCONFIG} MATCHES "/MD")
+      string(REGEX REPLACE "/MD" "/MT" CMAKE_C_FLAGS_${OUTPUTCONFIG} "${CMAKE_C_FLAGS_${OUTPUTCONFIG}}")
+    endif()
 
-        if(CMAKE_CXX_FLAGS_${OUTPUTCONFIG} MATCHES "/MD")
-            string(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_${OUTPUTCONFIG} "${CMAKE_CXX_FLAGS_${OUTPUTCONFIG}}")
-        endif()
-    endforeach()
+    if(CMAKE_CXX_FLAGS_${OUTPUTCONFIG} MATCHES "/MD")
+      string(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_${OUTPUTCONFIG} "${CMAKE_CXX_FLAGS_${OUTPUTCONFIG}}")
+    endif()
+  endforeach()
 
 else()
 
-    set(CMAKE_C_STANDARD 11)
+  set(CMAKE_C_STANDARD 11)
 endif()
 
 if(RPI)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
 endif()
 
 set(THIRDPARTY_DIR ${CMAKE_SOURCE_DIR}/vendor)
+# TODO: use this variable (containing a path) to get a list of all demos that
+# need to be converted using tools. It is simplest to always build the tools and
+# rebuild all the demos, then letting CMake itself decide if these are
+# up-to-date afterwards.
 set(DEMO_CARTS_IN ${CMAKE_SOURCE_DIR}/demos)
 
+# Tools and utilities used in some cases
 include(cmake/gif.cmake)
 include(cmake/blipbuf.cmake)
 include(cmake/zlib.cmake)
 include(cmake/zip.cmake)
 include(cmake/tools.cmake)
 
+# Languages
 include(cmake/lua.cmake)
 include(cmake/moon.cmake)
 include(cmake/fennel.cmake)
@@ -152,16 +165,20 @@ include(cmake/squirrel.cmake)
 include(cmake/pocketpy.cmake)
 include(cmake/quickjs.cmake)
 include(cmake/janet.cmake)
+include(cmake/r.cmake)
 
+# Core and editors
 include(cmake/core.cmake)
 include(cmake/wave.cmake)
 include(cmake/argparse.cmake)
 include(cmake/naett.cmake)
 include(cmake/png.cmake)
 include(cmake/studio.cmake)
 
+# Graphics libraries
 include(cmake/sdl.cmake)
 include(cmake/libretro.cmake)
 include(cmake/n3ds.cmake)
 
+# Installation, obviously.
 include(cmake/install.cmake)

assets.bat

@@ -1,29 +1,31 @@
 build\bin\prj2cart config.js build\config.tic
-build\bin\prj2cart demos\luademo.lua build\luademo.tic
+
 build\bin\prj2cart demos\benchmark.lua build\benchmark.tic
 build\bin\prj2cart demos\bpp.lua build\bpp.tic
 build\bin\prj2cart demos\car.lua build\car.tic
-build\bin\prj2cart demos\fenneldemo.fnl build\fenneldemo.tic
 build\bin\prj2cart demos\fire.lua build\fire.tic
 build\bin\prj2cart demos\font.lua build\font.tic
+build\bin\prj2cart demos\music.lua build\music.tic
+build\bin\prj2cart demos\p3d.lua build\p3d.tic
+build\bin\prj2cart demos\palette.lua build\palette.tic
+build\bin\prj2cart demos\quest.lua build\quest.tic
+build\bin\prj2cart demos\sfx.lua build\sfx.tic
+build\bin\prj2cart demos\tetris.lua build\tetris.tic
+
+build\bin\prj2cart demos\fenneldemo.fnl build\fenneldemo.tic
 build\bin\prj2cart demos\janetdemo.janet build\janetdemo.tic
 build\bin\prj2cart demos\jsdemo.js build\jsdemo.tic
 build\bin\prj2cart demos\luademo.lua build\luademo.tic
+build\bin\prj2cart demos\luademo.lua build\luademo.tic
 build\bin\prj2cart demos\moondemo.moon build\moondemo.tic
-build\bin\prj2cart demos\music.lua build\music.tic
-build\bin\prj2cart demos\p3d.lua build\p3d.tic
-build\bin\prj2cart demos\palette.lua build\palette.tic
 build\bin\prj2cart demos\pythondemo.py build\pythondemo.tic
-build\bin\prj2cart demos\quest.lua build\quest.tic
 build\bin\prj2cart demos\rubydemo.rb build\rubydemo.tic
 build\bin\prj2cart demos\schemedemo.scm build\schemedemo.tic
-build\bin\prj2cart demos\sfx.lua build\sfx.tic
 build\bin\prj2cart demos\squirreldemo.nut build\squirreldemo.tic
-build\bin\prj2cart demos\tetris.lua build\tetris.tic
 build\bin\prj2cart demos\wrendemo.wren build\wrendemo.tic
 
-build\bin\wasmp2cart demos\wasm\wasmdemo.wasmp build\wasmdemo.tic --binary demos\wasm\wasmdemo.wasm
 build\bin\wasmp2cart demos\bunny\wasmmark\wasmmark.wasmp build\wasmmark.tic --binary demos\bunny\wasmmark\wasmmark.wasm
+build\bin\wasmp2cart demos\wasm\wasmdemo.wasmp build\wasmdemo.tic --binary demos\wasm\wasmdemo.wasm
 
 build\bin\prj2cart demos\bunny\janetmark.janet build\janetmark.tic
 build\bin\prj2cart demos\bunny\jsmark.js build\jsmark.tic
@@ -35,29 +37,32 @@ build\bin\prj2cart demos\bunny\schememark.scm build\schememark.tic
 build\bin\prj2cart demos\bunny\squirrelmark.nut build\squirrelmark.tic
 build\bin\prj2cart demos\bunny\wrenmark.wren build\wrenmark.tic
 
-build\bin\bin2txt build\config.tic build\assets\config.tic.dat -z
-build\bin\bin2txt build\luademo.tic build\assets\luademo.tic.dat -z
-build\bin\bin2txt build\benchmark.tic build\assets\benchmark.tic.dat -z
 build\bin\bin2txt build\bpp.tic build\assets\bpp.tic.dat -z
 build\bin\bin2txt build\car.tic build\assets\car.tic.dat -z
-build\bin\bin2txt build\fenneldemo.tic build\assets\fenneldemo.tic.dat -z
+build\bin\bin2txt build\config.tic build\assets\config.tic.dat -z
 build\bin\bin2txt build\fire.tic build\assets\fire.tic.dat -z
 build\bin\bin2txt build\font.tic build\assets\font.tic.dat -z
+build\bin\bin2txt build\music.tic build\assets\music.tic.dat -z
+build\bin\bin2txt build\p3d.tic build\assets\p3d.tic.dat -z
+build\bin\bin2txt build\palette.tic build\assets\palette.tic.dat -z
+build\bin\bin2txt build\quest.tic build\assets\quest.tic.dat -z
+build\bin\bin2txt build\sfx.tic build\assets\sfx.tic.dat -z
+build\bin\bin2txt build\tetris.tic build\assets\tetris.tic.dat -z
+
+build\bin\bin2txt build\fenneldemo.tic build\assets\fenneldemo.tic.dat -z
 build\bin\bin2txt build\janetdemo.tic build\assets\janetdemo.tic.dat -z
 build\bin\bin2txt build\jsdemo.tic build\assets\jsdemo.tic.dat -z
 build\bin\bin2txt build\luademo.tic build\assets\luademo.tic.dat -z
+build\bin\bin2txt build\luademo.tic build\assets\luademo.tic.dat -z
 build\bin\bin2txt build\moondemo.tic build\assets\moondemo.tic.dat -z
-build\bin\bin2txt build\music.tic build\assets\music.tic.dat -z
-build\bin\bin2txt build\p3d.tic build\assets\p3d.tic.dat -z
-build\bin\bin2txt build\palette.tic build\assets\palette.tic.dat -z
 build\bin\bin2txt build\pythondemo.tic build\assets\pythondemo.tic.dat -z
-build\bin\bin2txt build\quest.tic build\assets\quest.tic.dat -z
 build\bin\bin2txt build\rubydemo.tic build\assets\rubydemo.tic.dat -z
 build\bin\bin2txt build\schemedemo.tic build\assets\schemedemo.tic.dat -z
-build\bin\bin2txt build\sfx.tic build\assets\sfx.tic.dat -z
 build\bin\bin2txt build\squirreldemo.tic build\assets\squirreldemo.tic.dat -z
-build\bin\bin2txt build\tetris.tic build\assets\tetris.tic.dat -z
+build\bin\bin2txt build\wasmdemo.tic build\assets\wasmdemo.tic.dat -z
 build\bin\bin2txt build\wrendemo.tic build\assets\wrendemo.tic.dat -z
+
+build\bin\bin2txt build\benchmark.tic build\assets\benchmark.tic.dat -z
 build\bin\bin2txt build\janetmark.tic build\assets\janetmark.tic.dat -z
 build\bin\bin2txt build\jsmark.tic build\assets\jsmark.tic.dat -z
 build\bin\bin2txt build\luamark.tic build\assets\luamark.tic.dat -z
@@ -68,6 +73,5 @@ build\bin\bin2txt build\schememark.tic build\assets\schememark.tic.dat -z
 build\bin\bin2txt build\squirrelmark.tic build\assets\squirrelmark.tic.dat -z
 build\bin\bin2txt build\wasmmark.tic build\assets\wasmmark.tic.dat -z
 build\bin\bin2txt build\wrenmark.tic build\assets\wrenmark.tic.dat -z
-build\bin\bin2txt build\wasmdemo.tic build\assets\wasmdemo.tic.dat -z
 
 build\bin\bin2txt build\cart.png build\assets\cart.png.dat