ruby2d 0.11.1 → 0.11.2

data/bin/ruby2d

@@ -25,9 +25,8 @@ Use the #{'build'.bold} command to compile or build Ruby 2D apps.
 To compile and create a native executable, use:
   build --native <ruby_file>
 
-To build for the web, creating a JavaScript and HTML package, use:
+To build for the web with WebAssembly, use:
   build --web <ruby_file>
-  #{'Warning:'.warn} #{"This feature is currently disabled while it's being upgraded.".bold}
 
 To build a macOS app bundle, use:
   build --macos <ruby_file>
@@ -82,9 +81,9 @@ when 'build'
   if ARGV.delete '--debug' then @debug = true end
   case ARGV[1]
   when '--native'
-    build_native(ARGV[2])
+    build(:native, ARGV[2])
   when '--web'
-    build_web(ARGV[2])
+    build(:web, ARGV[2])
   when '--macos'
     build_macos(ARGV[2])
   when '--ios'

data/ext/ruby2d/extconf.rb

@@ -1,26 +1,9 @@
 require 'mkmf'
 require_relative '../../lib/ruby2d/cli/colorize'
+require_relative '../../lib/ruby2d/cli/platform'
 
 $errors = []  # Holds errors
 
-# Set the OS platform
-case RUBY_PLATFORM
-when /darwin/
-  $platform = :macos
-when /linux/
-  $platform = :linux
-  if `cat /etc/os-release` =~ /raspbian/
-    $platform = :linux_rpi
-  end
-when /bsd/
-  $platform = :bsd
-when /mingw/
-  $platform = :windows
-else
-  $platform = nil
-end
-
-
 # Helper functions #############################################################
 
 # Print installation errors
@@ -111,29 +94,60 @@ if ARGV.include? 'libs'
 else
   add_flags(:c, '-std=c11')
 
-  case $platform
+  case $RUBY2D_PLATFORM
 
   when :macos
     add_flags(:c, '-I../../assets/include')
-    ldir = "#{Dir.pwd}/../../assets/macos/lib"
+    ldir = "#{Dir.pwd}/../../assets/macos/universal/lib"
 
     add_flags(:ld, "#{ldir}/libSDL2.a #{ldir}/libSDL2_image.a #{ldir}/libSDL2_mixer.a #{ldir}/libSDL2_ttf.a")
     add_flags(:ld, "#{ldir}/libjpeg.a #{ldir}/libpng16.a #{ldir}/libtiff.a #{ldir}/libwebp.a")
-    add_flags(:ld, "#{ldir}/libmpg123.a #{ldir}/libogg.a #{ldir}/libFLAC.a #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a")
-    add_flags(:ld, "#{ldir}/libfreetype.a #{ldir}/libmodplug.a")
+    add_flags(:ld, "#{ldir}/libmpg123.a #{ldir}/libogg.a #{ldir}/libFLAC.a #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a #{ldir}/libmodplug.a")
+    add_flags(:ld, "#{ldir}/libfreetype.a #{ldir}/libharfbuzz.a #{ldir}/libgraphite2.a")
     add_flags(:ld, "-Wl,-framework,Cocoa -Wl,-framework,GameController -Wl,-framework,ForceFeedback")
 
+    # Delete the quarantine attribute on the mruby compiler executable
+    # (This may not be needed)
+    #   system "xattr -d com.apple.quarantine #{Dir.pwd}/../../assets/macos/universal/bin/mrbc"
+
   when :linux, :linux_rpi, :bsd
     check_sdl
 
     set_rpi_flags
     add_flags(:ld, "-lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lm")
-    if $platform == :linux then add_flags(:ld, '-lGL') end
+    if $RUBY2D_PLATFORM == :linux then add_flags(:ld, '-lGL') end
 
   when :windows
     add_flags(:c, '-I../../assets/include')
-    add_flags(:ld, '-L../../assets/mingw/lib -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf')
-    add_flags(:ld, '-lmingw32 -lopengl32 -lglew32')
+    ldir = "#{Dir.pwd}/../../assets/windows/mingw-w64-x86_64/lib"
+
+    # Start linker flags (needed to avoid circular dependencies)
+    add_flags(:ld, "-Wl,--start-group")
+
+    # SDL2
+    add_flags(:ld, "#{ldir}/libSDL2.a")
+
+    # SDL2_image
+    add_flags(:ld, "#{ldir}/libSDL2_image.a")
+    add_flags(:ld, "#{ldir}/libjpeg.a #{ldir}/libpng16.a #{ldir}/libtiff.a #{ldir}/libwebp.a")
+    add_flags(:ld, "#{ldir}/libjbig.a #{ldir}/libdeflate.a #{ldir}/liblzma.a #{ldir}/libzstd.a #{ldir}/libLerc.a")
+
+    # SDL2_mixer
+    add_flags(:ld, "#{ldir}/libSDL2_mixer.a")
+    add_flags(:ld, "#{ldir}/libmpg123.a #{ldir}/libFLAC.a #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a #{ldir}/libogg.a "\
+                   "#{ldir}/libmodplug.a #{ldir}/libopus.a #{ldir}/libopusfile.a #{ldir}/libsndfile.a")
+
+    # SDL2_ttf
+    add_flags(:ld, "#{ldir}/libSDL2_ttf.a")
+    add_flags(:ld, "#{ldir}/libfreetype.a #{ldir}/libharfbuzz.a #{ldir}/libgraphite2.a "\
+                   "#{ldir}/libbz2.a #{ldir}/libbrotlicommon.a #{ldir}/libbrotlidec.a")
+
+    # Other dependencies
+    add_flags(:ld, "#{ldir}/libglew32.a #{ldir}/libstdc++.a #{ldir}/libz.a")
+    add_flags(:ld, '-lmingw32 -lopengl32 -lole32 -loleaut32 -limm32 -lversion -lwinmm -lrpcrt4 -mwindows -lsetupapi -ldwrite')
+
+    # End linker flags
+    add_flags(:ld, "-Wl,--end-group")
 
   # If can't detect the platform, use libraries installed by the user
   else

data/ext/ruby2d/gl.c

@@ -382,7 +382,7 @@ void R2D_GL_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GL
 void R2D_GL_FlushBuffers() {
   // Only implemented in our OpenGL 3.3+ and ES 2.0 renderers
   #if GLES
-    // TODO: R2D_GLES_FlushBuffers();
+    R2D_GLES_FlushBuffers();
   #else
     if (!R2D_GL2) R2D_GL3_FlushBuffers();
   #endif

data/ext/ruby2d/gl3.c

@@ -2,7 +2,6 @@
 
 #include "ruby2d.h"
 
-// Skip this file if OpenGL ES
 #if !GLES
 
 static GLuint vbo;  // our primary vertex buffer object (VBO)