Fixes for Ruby 3.3.0

This commit is contained in:
2023-12-29 17:58:30 -06:00
parent e3a33b784a
commit 2fe15cb511
3 changed files with 19 additions and 8 deletions

View File

@@ -1,5 +1,6 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "base64"
gem "cyberarm_engine" gem "cyberarm_engine"
gem "sdl2-bindings" gem "sdl2-bindings"
gem "digest-crc" gem "digest-crc"

View File

@@ -1,6 +1,7 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
base64 (0.2.0)
concurrent-ruby (1.2.2) concurrent-ruby (1.2.2)
cyberarm_engine (0.24.0) cyberarm_engine (0.24.0)
excon (~> 0.88) excon (~> 0.88)
@@ -9,7 +10,7 @@ GEM
digest-crc (0.6.5) digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0) rake (>= 12.0.0, < 14.0.0)
event_emitter (0.2.6) event_emitter (0.2.6)
excon (0.104.0) excon (0.108.0)
ffi (1.16.3) ffi (1.16.3)
ffi-win32-extensions (1.0.4) ffi-win32-extensions (1.0.4)
ffi ffi
@@ -39,6 +40,7 @@ PLATFORMS
x86_64-linux x86_64-linux
DEPENDENCIES DEPENDENCIES
base64
cyberarm_engine cyberarm_engine
digest-crc digest-crc
i18n i18n
@@ -51,4 +53,4 @@ DEPENDENCIES
win32-security win32-security
BUNDLED WITH BUNDLED WITH
2.4.14 2.5.3

View File

@@ -1,6 +1,12 @@
# Hint to SDL that we're not a game and that the system may sleep # Hint to SDL that we're not a game and that the system may sleep
ENV["SDL_VIDEO_ALLOW_SCREENSAVER"] = "1" ENV["SDL_VIDEO_ALLOW_SCREENSAVER"] = "1"
BUNDLER_USED = ARGV.join.include?("--bundler")
if BUNDLER_USED
require "bundler/setup"
Bundler.require
end
require "fileutils" require "fileutils"
require "digest" require "digest"
require "rexml" require "rexml"
@@ -53,13 +59,15 @@ module Kernel
end end
end end
begin unless BUNDLER_USED
require_relative "../cyberarm_engine/lib/cyberarm_engine" begin
rescue LoadError => e require_relative "../cyberarm_engine/lib/cyberarm_engine"
logger.warn(W3DHub::LOG_TAG) { "Failed to load local cyberarm_engine:" } rescue LoadError => e
logger.warn(W3DHub::LOG_TAG) { e } logger.warn(W3DHub::LOG_TAG) { "Failed to load local cyberarm_engine:" }
logger.warn(W3DHub::LOG_TAG) { e }
require "cyberarm_engine" require "cyberarm_engine"
end
end end
class W3DHub class W3DHub