ruby2d · richpeck · Dec 19, 2021 · Dec 19, 2021 · Jan 9, 2022
diff --git a/lib/ruby2d.rb b/lib/ruby2d.rb
@@ -28,6 +28,17 @@
   if defined?(RubyInstaller)
     s2d_dll_path = Gem::Specification.find_by_name('ruby2d').gem_dir + '/assets/mingw/bin'
     RubyInstaller::Runtime.add_dll_directory(File.expand_path(s2d_dll_path))
+  elsif RUBY_PLATFORM =~ /mingw/
+    # https://stackoverflow.com/a/59045531/1143732
+    require 'fiddle/import'
+    require 'fiddle/types'
+    module WinAPI
+      extend Fiddle::Importer
+      dlload 'kernel32.dll'
+      include Fiddle::Win32Types
+      extern 'int SetDllDirectory(LPCSTR)'
+    end
+    WinAPI.SetDllDirectory(Gem::Specification.find_by_name('ruby2d').gem_dir + '/assets/mingw/bin')
   end
 
   require 'ruby2d/ruby2d'  # load native extension

diff --git a/lib/ruby2d/cli/build.rb b/lib/ruby2d/cli/build.rb
@@ -73,7 +73,7 @@ def build_native(rb_file)
   check_build_src_file(rb_file)
 
   # Check if MRuby exists; if not, quit
-  if `which mruby`.empty?
+  if `which mruby`.empty? || `where mruby`.empty?
     puts "#{'Error:'.error} Can't find MRuby, which is needed to build native Ruby 2D applications.\n"
     exit
   end

diff --git a/lib/ruby2d/window.rb b/lib/ruby2d/window.rb
@@ -273,7 +273,7 @@ def remove(o)
         raise Error, "Cannot remove '#{o.class}' from window!"
       end
 
-      collection = o.class.ancestors.include?(Ruby2D::Entity) ? @entities : @objects
+      collection = o.class.ancestors.include?('Ruby2D::Entity') ? @entities : @objects
       if i = collection.index(o)
         collection.delete_at(i)
         true