ruby2d 0.10.0 → 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,24 +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 /mingw/
-  $platform = :windows
-else
-  $platform = nil
-end
-
-
 # Helper functions #############################################################
 
 # Print installation errors
@@ -41,32 +26,38 @@ def add_flags(type, flags)
 end
 
 
-# Check SDL libraries on Linux
-def check_sdl_linux
+# Check for SDL libraries
+def check_sdl
   unless have_library('SDL2') && have_library('SDL2_image') && have_library('SDL2_mixer') && have_library('SDL2_ttf')
 
     $errors << "Couldn't find packages needed by Ruby 2D."
 
-    # Fedora and CentOS
-    if system('which yum')
-      $errors << "Install the following packages using `yum` (or `dnf`) and try again:\n" <<
-      "  SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel".bold
-
-    # Arch
-    elsif system('which pacman')
-      $errors << "Install the following packages using `pacman` and try again:\n" <<
+    case $platform
+    when :linux, :linux_rpi
+      # Fedora and CentOS
+      if system('which yum')
+        $errors << "Install the following packages using `yum` (or `dnf`) and try again:\n" <<
+        "  SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel".bold
+
+      # Arch
+      elsif system('which pacman')
+        $errors << "Install the following packages using `pacman` and try again:\n" <<
+        "  sdl2 sdl2_image sdl2_mixer sdl2_ttf".bold
+
+      # openSUSE
+      elsif system('which zypper')
+        $errors << "Install the following packages using `zypper` and try again:\n" <<
+        "  libSDL2-devel libSDL2_image-devel libSDL2_mixer-devel libSDL2_ttf-devel".bold
+
+      # Ubuntu, Debian, and Mint
+      # `apt` must be last because openSUSE has it aliased to `zypper`
+      elsif system('which apt')
+        $errors << "Install the following packages using `apt` and try again:\n" <<
+        "  libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev".bold
+      end
+    when :bsd
+      $errors << "Install the following packages using `pkg` and try again:\n" <<
       "  sdl2 sdl2_image sdl2_mixer sdl2_ttf".bold
-
-    # openSUSE
-    elsif system('which zypper')
-      $errors << "Install the following packages using `zypper` and try again:\n" <<
-      "  libSDL2-devel libSDL2_image-devel libSDL2_mixer-devel libSDL2_ttf-devel".bold
-
-    # Ubuntu, Debian, and Mint
-    # `apt` must be last because openSUSE has it aliased to `zypper`
-    elsif system('which apt')
-      $errors << "Install the following packages using `apt` and try again:\n" <<
-      "  libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev".bold
     end
 
     $errors << "" << "See #{"ruby2d.com".bold} for additional help."
@@ -103,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")
+    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")
 
-  when :linux, :linux_rpi
-    check_sdl_linux
+    # 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/font.c

@@ -0,0 +1,35 @@
+// font.c
+
+#include "ruby2d.h"
+
+
+/*
+ * Create a TTF_Font object given a path to a font and a size
+ */
+TTF_Font *R2D_FontCreateTTFFont(const char *path, int size, const char *style) {
+
+ // Check if font file exists
+  if (!R2D_FileExists(path)) {
+    R2D_Error("R2D_FontCreateTTFFont", "Font file `%s` not found", path);
+    return NULL;
+  }
+
+  TTF_Font *font = TTF_OpenFont(path, size);
+
+  if (!font) {
+    R2D_Error("TTF_OpenFont", TTF_GetError());
+    return NULL;
+  }
+
+  if(strncmp(style, "bold", 4) == 0) {
+    TTF_SetFontStyle(font, TTF_STYLE_BOLD);
+  } else if(strncmp(style, "italic", 6) == 0) {
+    TTF_SetFontStyle(font, TTF_STYLE_ITALIC);
+  } else if(strncmp(style, "underline", 9) == 0) {
+    TTF_SetFontStyle(font, TTF_STYLE_UNDERLINE);
+  } else if(strncmp(style, "strikethrough", 13) == 0) {
+    TTF_SetFontStyle(font, TTF_STYLE_STRIKETHROUGH);
+  }
+
+  return font;
+}