Update TIC-80

.gitlab-ci.yml

@@ -9,13 +9,39 @@
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
     CORENAME: tic80
-    CORE_ARGS: -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON -DBUILD_WITH_MRUBY=OFF -DCMAKE_BUILD_TYPE=Release
-    EXTRA_PATH: lib
+    CORE_ARGS: >
+      -DBUILD_LIBRETRO=ON
+      -D__LIBRETRO__=ON
+      -DBUILD_PLAYER=OFF
+      -DBUILD_PRO=OFF
+      -DBUILD_SDL=OFF
+      -DBUILD_TOOLS=OFF
+      -DBUILD_TOUCH_INPUT=OFF
+      -DBUILD_STATIC=ON
+      -DBUILD_WITH_ALL=OFF
+      -DBUILD_WITH_LUA=ON
+      -DBUILD_WITH_MOON=ON
+      -DBUILD_WITH_FENNEL=ON
+      -DBUILD_WITH_WREN=ON
+      -DBUILD_WITH_WASM=ON
+      -DBUILD_WITH_SQUIRREL=ON
+      -DBUILD_WITH_PYTHON=ON
+      -DBUILD_WITH_JS=ON
+      -DBUILD_WITH_JANET=ON
+      -DBUILD_WITH_RUBY=OFF
+      -DBUILD_WITH_YUE=OFF
+      -DBUILD_WITH_SCHEME=OFF
+      -DBUILD_WITH_JANET=OFF
+      -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+      -DCMAKE_BUILD_TYPE=Release
+      -DBUILD_EDITORS=OFF
+      $CORE_ARGS_EXTRA
+    EXTRA_PATH: bin
     CMAKE_SOURCE_ROOT: core
 
 # Inclusion templates, required for the build to work
 include:
-  ################################## DESKTOPS ################################    
+  ################################## DESKTOPS ################################
   # Linux
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-cmake.yml'
@@ -36,7 +62,7 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/osx-cmake-ppc.yml'
 
-  ################################## CELLULAR ################################    
+  ################################## CELLULAR ################################
   # Android
   - project: 'libretro-infrastructure/ci-templates'
     file: '/android-cmake.yml'
@@ -56,7 +82,7 @@ include:
 
   # Libnx
   - project: 'libretro-infrastructure/ci-templates'
-    file: '/libnx-static-cmake.yml' 
+    file: '/libnx-static-cmake.yml'
 
   # Gamecube
   - project: 'libretro-infrastructure/ci-templates'
@@ -73,19 +99,46 @@ include:
   ################################## MISC ####################################
   # Emscripten
   - project: 'libretro-infrastructure/ci-templates'
-    file: '/emscripten-static-cmake.yml' 
+    file: '/emscripten-static-cmake.yml'
 
 # Stages for building
 stages:
   - build-prepare
   - build-shared
   - build-static
 
+.js-patch:
+  before_script:
+    - export NUMPROC=$(($(nproc)/5))
+    - echo 'set(CMAKE_C_FLAGS_RELEASE "-DPOOR_CLIB" CACHE STRING "" FORCE)' > build_flags.cmake
+    - export CORE_ARGS="${CORE_ARGS} -C ${CI_PROJECT_DIR}/build_flags.cmake"
+    - sed -i 's|#include <fenv.h>|#if __has_include(<fenv.h>)\n#include <fenv.h>\n#endif|' "$CI_PROJECT_DIR/$CMAKE_SOURCE_ROOT/vendor/quickjs/quickjs.c"
+
+.core-some-32bits-system:
+  variables:
+    EXTRA_PATH: lib
+  before_script:
+    - export NUMPROC=$(($(nproc)/5))
+    - '[ -n "${DEVKITPPC:-}" ] && export PATH="$PATH:$DEVKITPPC/bin"'
+    - |
+      echo 'set(CMAKE_C_FLAGS_RELEASE "-DLUA_32BITS -DTIC80_FFT_UNSUPPORTED -DPOOR_CLIB" CACHE STRING "" FORCE)' > build_flags.cmake
+      echo 'set(CMAKE_CXX_FLAGS_RELEASE "-DLUA_32BITS" CACHE STRING "" FORCE)' >> build_flags.cmake
+    - export CORE_ARGS="${CORE_ARGS} -C ${CI_PROJECT_DIR}/build_flags.cmake"
+    - sed -i 's|#include <fenv.h>|#if __has_include(<fenv.h>)\n#include <fenv.h>\n#endif|' "$CI_PROJECT_DIR/$CMAKE_SOURCE_ROOT/vendor/quickjs/quickjs.c"
+    - curl -L https://raw.githubusercontent.com/imsys/TIC-80/1fff1af2e33d71a586abdcac82cf3c3dbf881c49/cmake/libretro.cmake -o "$CI_PROJECT_DIR/$CMAKE_SOURCE_ROOT/cmake/libretro.cmake"
+    - |
+      curl -L https://github.com/Kitware/CMake/releases/download/v3.31.11/cmake-3.31.11-linux-x86_64.sh -o cmake-install.sh
+      chmod +x cmake-install.sh
+      mkdir -p "$CI_PROJECT_DIR/cmake"
+      ./cmake-install.sh --skip-license --prefix="$CI_PROJECT_DIR/cmake"
+      export PATH="$CI_PROJECT_DIR/cmake/bin:$PATH"
+      cmake --version
+
 ##############################################################################
 #################################### STAGES ##################################
 ##############################################################################
 #
-################################### DESKTOPS #################################    
+################################### DESKTOPS #################################
 # Linux 64-bit
 libretro-build-linux-x64:
   extends:
@@ -103,12 +156,16 @@ libretro-build-windows-x64:
   extends:
     - .libretro-windows-cmake-x86_64
     - .core-defs
+  variables:
+    EXTRA_PATH: lib
 
 # Windows 32-bit
 libretro-build-windows-i686:
   extends:
     - .libretro-windows-cmake-x86
     - .core-defs
+  variables:
+    EXTRA_PATH: lib
 
 # MacOS 64-bit
 libretro-build-osx-x64:
@@ -122,7 +179,7 @@ libretro-build-osx-ppc:
     - .libretro-osx-cmake-ppc
     - .core-defs
   variables:
-    CORE_ARGS: -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON -DBUILD_WITH_MRUBY=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.4 -DUSE_LIBUV=OF
+    CORE_ARGS: "${CORE_ARGS} -DCMAKE_OSX_DEPLOYMENT_TARGET=10.4 -DUSE_LIBUV=OFF"
 
 # MacOS ARM64
 libretro-build-osx-arm64:
@@ -138,10 +195,11 @@ libretro-build-osx-x86:
 
 ################################### CELLULAR #################################
 # Android ARMv7a
-android-armeabi-v7a:
-  extends:
-    - .libretro-android-cmake-armeabi-v7a
-    - .core-defs
+# TODO: Android ARMv7a needs localeconv in locale.h, along with log2, which is not available on this Android build.
+#android-armeabi-v7a:
+#  extends:
+#    - .libretro-android-cmake-armeabi-v7a
+#    - .core-defs
 
 # Android ARMv8a
 android-arm64-v8a:
@@ -156,18 +214,13 @@ android-x86_64:
     - .core-defs
 
 # Android 32-bit x86
-android-x86:
-  extends:
-    - .libretro-android-cmake-x86
-    - .core-defs
+# TODO: Android x86 needs localeconv in locale.h, along with log2, which is not available on this Android build.
+#android-x86:
+#  extends:
+#    - .libretro-android-cmake-x86
+#    - .core-defs
 
 ################################### CONSOLES #################################
-# Nintendo 3DS
-libretro-build-ctr:
-  extends:
-    - .libretro-ctr-static-cmake-retroarch-master
-    - .core-defs
-
 # OpenDingux
 libretro-build-dingux-mips32:
   extends:
@@ -182,6 +235,7 @@ libretro-build-dingux-odbeta-mips32:
   extends:
     - .libretro-dingux-odbeta-cmake-mips32
     - .core-defs
+    - .js-patch
   variables:
     DINGUX_CFLAGS:   -DDINGUX -fomit-frame-pointer -march=mips32 -mtune=mips32r2 -mhard-float
     DINGUX_CXXFLAGS: -DDINGUX -fomit-frame-pointer -march=mips32 -mtune=mips32r2 -mhard-float
@@ -191,6 +245,7 @@ libretro-build-retrofw-mips32:
   extends:
     - .libretro-retrofw-odbeta-cmake-mips32
     - .core-defs
+    - .js-patch
   variables:
     DINGUX_CFLAGS:   -DDINGUX -fomit-frame-pointer -march=mips32 -mtune=mips32r2 -mhard-float
     DINGUX_CXXFLAGS: -DDINGUX -fomit-frame-pointer -march=mips32 -mtune=mips32r2 -mhard-float
@@ -200,6 +255,7 @@ libretro-build-miyoo-arm32:
   extends:
     - .libretro-miyoo-cmake-arm32
     - .core-defs
+    - .js-patch
   variables:
     DINGUX_CFLAGS:   -DDINGUX -fomit-frame-pointer -fno-fast-math -march=armv5te -mtune=arm926ej-s -ftree-vectorize -funswitch-loops
     DINGUX_CXXFLAGS: -DDINGUX -fomit-frame-pointer -fno-fast-math -march=armv5te -mtune=arm926ej-s -ftree-vectorize -funswitch-loops
@@ -210,13 +266,25 @@ libretro-build-vita:
     - .libretro-vita-static-cmake-retroarch-master
     - .core-defs
   variables:
-    CORE_ARGS: -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON -DBUILD_WITH_MRUBY=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=OFF -DCMAKE_BUILD_TYPE=Release
+    EXTRA_PATH: lib
+  before_script:
+    - export NUMPROC=$(($(nproc)/5))
+    - echo 'set(CMAKE_C_FLAGS_RELEASE "-DPOOR_CLIB" CACHE STRING "" FORCE)' > build_flags.cmake
+    - curl -L https://raw.githubusercontent.com/imsys/TIC-80/1fff1af2e33d71a586abdcac82cf3c3dbf881c49/cmake/libretro.cmake -o "$CI_PROJECT_DIR/$CMAKE_SOURCE_ROOT/cmake/libretro.cmake"
+    - export CORE_ARGS="${CORE_ARGS} -DCMAKE_POSITION_INDEPENDENT_CODE=OFF -C ${CI_PROJECT_DIR}/build_flags.cmake"
 
 # Libnx
 libretro-build-libnx-aarch64:
   extends:
     - .libretro-libnx-static-cmake-retroarch-master
     - .core-defs
+  variables:
+    EXTRA_PATH: lib
+  before_script:
+    - export NUMPROC=$(($(nproc)/5))
+    - curl -L https://raw.githubusercontent.com/imsys/TIC-80/1fff1af2e33d71a586abdcac82cf3c3dbf881c49/cmake/libretro.cmake -o "$CI_PROJECT_DIR/$CMAKE_SOURCE_ROOT/cmake/libretro.cmake"
+    - sed -i '13,31 s/^/#/' "$CI_PROJECT_DIR/$CMAKE_SOURCE_ROOT/cmake/nswitch.cmake"
+    - sed -i 's/set(PREFER_SYSTEM_LIBRARIES ON)/set(PREFER_SYSTEM_LIBRARIES OFF)/' "$CI_PROJECT_DIR/$CMAKE_SOURCE_ROOT/CMakeLists.txt"
 
 libretro-build-rs90-odbeta-mips32:
   extends:
@@ -226,23 +294,36 @@ libretro-build-rs90-odbeta-mips32:
     DINGUX_CFLAGS:   -DDINGUX -fomit-frame-pointer -march=mips32 -mtune=mips32 -fno-fast-math
     DINGUX_CXXFLAGS: -DDINGUX -fomit-frame-pointer -march=mips32 -mtune=mips32 -fno-fast-math
 
+# Nintendo 3DS
+libretro-build-ctr:
+  extends:
+    - .libretro-ctr-static-cmake-retroarch-master
+    - .core-defs
+    - .core-some-32bits-system
+
 # Gamecube
 libretro-build-ngc:
   extends:
     - .libretro-ngc-static-cmake-retroarch-master
     - .core-defs
+    - .core-some-32bits-system
 
 # Wii
 libretro-build-wii:
   extends:
     - .libretro-wii-static-cmake-retroarch-master
     - .core-defs
+    - .core-some-32bits-system
 
 # WiiU
 libretro-build-wiiu:
   extends:
     - .libretro-wiiu-static-cmake-retroarch-master
     - .core-defs
+    - .core-some-32bits-system
+  variables:
+    CORE_ARGS_EXTRA: >
+      -DBUILD_WITH_PYTHON=OFF
 
 ################################### MISC #####################################
 
@@ -251,3 +332,7 @@ libretro-build-emscripten:
   extends:
     - .libretro-emscripten-static-cmake-retroarch-master
     - .core-defs
+  variables:
+    EXTRA_PATH: lib
+  before_script:
+    - curl -L https://raw.githubusercontent.com/imsys/TIC-80/1fff1af2e33d71a586abdcac82cf3c3dbf881c49/cmake/libretro.cmake -o "$CI_PROJECT_DIR/$CMAKE_SOURCE_ROOT/cmake/libretro.cmake"

README.md

@@ -2,6 +2,19 @@
 
 Build definitions for the [TIC-80](https://tic80.com/) libretro core. To make any changes to the core code, visit the [upstream repository](https://github.com/nesbox/tic-80).
 
+## Configuration
+
+The following languages have been disabled in the TIC-80 core to allow building across all of libretro's targets...
+
+- Ruby
+- Python
+- Janet
+- Scheme
+- Squirrel
+- WASM
+- Fennel
+- JavaScript
+
 ## License
 
 [MIT](LICENSE)