ruby2d 0.8.1 → 0.9.0

data/assets/tvos/MRuby.framework/Headers/mruby/throw.h

@@ -15,9 +15,9 @@
 
 #if defined(MRB_ENABLE_CXX_EXCEPTION) && defined(__cplusplus)
 
-#define MRB_TRY(buf) do { try {
+#define MRB_TRY(buf) try {
 #define MRB_CATCH(buf) } catch(mrb_jmpbuf_impl e) { if (e != (buf)->impl) { throw e; }
-#define MRB_END_EXC(buf)  } } while(0)
+#define MRB_END_EXC(buf)  }
 
 #define MRB_THROW(buf) throw((buf)->impl)
 typedef mrb_int mrb_jmpbuf_impl;
@@ -34,9 +34,9 @@ typedef mrb_int mrb_jmpbuf_impl;
 #define MRB_LONGJMP longjmp
 #endif
 
-#define MRB_TRY(buf) do { if (MRB_SETJMP((buf)->impl) == 0) {
+#define MRB_TRY(buf) if (MRB_SETJMP((buf)->impl) == 0) {
 #define MRB_CATCH(buf) } else {
-#define MRB_END_EXC(buf) } } while(0)
+#define MRB_END_EXC(buf) }
 
 #define MRB_THROW(buf) MRB_LONGJMP((buf)->impl, 1);
 #define mrb_jmpbuf_impl jmp_buf

data/assets/tvos/MRuby.framework/Headers/mruby/variable.h

@@ -31,8 +31,6 @@ struct global_entry {
 
 mrb_value mrb_vm_special_get(mrb_state*, mrb_sym);
 void mrb_vm_special_set(mrb_state*, mrb_sym, mrb_value);
-mrb_value mrb_vm_iv_get(mrb_state*, mrb_sym);
-void mrb_vm_iv_set(mrb_state*, mrb_sym, mrb_value);
 mrb_value mrb_vm_cv_get(mrb_state*, mrb_sym);
 void mrb_vm_cv_set(mrb_state*, mrb_sym, mrb_value);
 mrb_value mrb_vm_const_get(mrb_state*, mrb_sym);
@@ -42,8 +40,8 @@ MRB_API void mrb_const_set(mrb_state*, mrb_value, mrb_sym, mrb_value);
 MRB_API mrb_bool mrb_const_defined(mrb_state*, mrb_value, mrb_sym);
 MRB_API void mrb_const_remove(mrb_state*, mrb_value, mrb_sym);
 
-MRB_API mrb_bool mrb_iv_p(mrb_state *mrb, mrb_sym sym);
-MRB_API void mrb_iv_check(mrb_state *mrb, mrb_sym sym);
+MRB_API mrb_bool mrb_iv_name_sym_p(mrb_state *mrb, mrb_sym sym);
+MRB_API void mrb_iv_name_sym_check(mrb_state *mrb, mrb_sym sym);
 MRB_API mrb_value mrb_obj_iv_get(mrb_state *mrb, struct RObject *obj, mrb_sym sym);
 MRB_API void mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v);
 MRB_API mrb_bool mrb_obj_iv_defined(mrb_state *mrb, struct RObject *obj, mrb_sym sym);

data/assets/tvos/MRuby.framework/Headers/mruby/version.h

@@ -27,7 +27,7 @@ MRB_BEGIN_DECL
 /*
  * The version of Ruby used by mruby.
  */
-#define MRUBY_RUBY_VERSION "1.9"
+#define MRUBY_RUBY_VERSION "2.0"
 
 /*
  * Ruby engine.
@@ -37,12 +37,12 @@ MRB_BEGIN_DECL
 /*
  * Major release version number.
  */
-#define MRUBY_RELEASE_MAJOR 1
+#define MRUBY_RELEASE_MAJOR 2
 
 /*
  * Minor release version number.
  */
-#define MRUBY_RELEASE_MINOR 3
+#define MRUBY_RELEASE_MINOR 0
 
 /*
  * Tiny release version number.
@@ -62,17 +62,17 @@ MRB_BEGIN_DECL
 /*
  * Release year.
  */
-#define MRUBY_RELEASE_YEAR 2017
+#define MRUBY_RELEASE_YEAR 2018
 
 /*
  * Release month.
  */
-#define MRUBY_RELEASE_MONTH 7
+#define MRUBY_RELEASE_MONTH 12
 
 /*
  * Release day.
  */
-#define MRUBY_RELEASE_DAY 4
+#define MRUBY_RELEASE_DAY 11
 
 /*
  * Release date as a string.

data/assets/tvos/MyApp.xcodeproj/project.pbxproj

@@ -3,13 +3,14 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 48;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		E2206BB41F4AB3AC002BD456 /* Simple2D.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2206BB31F4AB3AC002BD456 /* Simple2D.framework */; };
 		E228A73E1F16780900E03F68 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E228A73D1F16780900E03F68 /* Assets.xcassets */; };
 		E228A7461F1678F000E03F68 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = E228A7451F1678F000E03F68 /* main.c */; };
+		E2309DC022532AF60005CB0C /* MRuby.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2309DBF22532AF60005CB0C /* MRuby.framework */; };
 		E25EF19A1F167AF90045EA1D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E25EF1901F167AF90045EA1D /* AudioToolbox.framework */; };
 		E25EF19B1F167AF90045EA1D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E25EF1911F167AF90045EA1D /* AVFoundation.framework */; };
 		E25EF19C1F167AF90045EA1D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E25EF1921F167AF90045EA1D /* CoreGraphics.framework */; };
@@ -20,7 +21,6 @@
 		E25EF1A11F167AF90045EA1D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E25EF1971F167AF90045EA1D /* OpenGLES.framework */; };
 		E25EF1A21F167AF90045EA1D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E25EF1981F167AF90045EA1D /* QuartzCore.framework */; };
 		E25EF1A31F167AF90045EA1D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E25EF1991F167AF90045EA1D /* UIKit.framework */; };
-		E2D0E9131F764B5E000AF870 /* MRuby.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2D0E9121F764B5E000AF870 /* MRuby.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -29,6 +29,7 @@
 		E228A73D1F16780900E03F68 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		E228A73F1F16780900E03F68 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E228A7451F1678F000E03F68 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
+		E2309DBF22532AF60005CB0C /* MRuby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MRuby.framework; sourceTree = "<group>"; };
 		E25EF1901F167AF90045EA1D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		E25EF1911F167AF90045EA1D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		E25EF1921F167AF90045EA1D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -39,7 +40,6 @@
 		E25EF1971F167AF90045EA1D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		E25EF1981F167AF90045EA1D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		E25EF1991F167AF90045EA1D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		E2D0E9121F764B5E000AF870 /* MRuby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MRuby.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -47,7 +47,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E2D0E9131F764B5E000AF870 /* MRuby.framework in Frameworks */,
+				E2309DC022532AF60005CB0C /* MRuby.framework in Frameworks */,
 				E2206BB41F4AB3AC002BD456 /* Simple2D.framework in Frameworks */,
 				E25EF19A1F167AF90045EA1D /* AudioToolbox.framework in Frameworks */,
 				E25EF19B1F167AF90045EA1D /* AVFoundation.framework in Frameworks */,
@@ -71,8 +71,8 @@
 				E228A7451F1678F000E03F68 /* main.c */,
 				E228A73D1F16780900E03F68 /* Assets.xcassets */,
 				E228A73F1F16780900E03F68 /* Info.plist */,
-				E228A72F1F16780900E03F68 /* Products */,
 				E25EF17D1F1679F30045EA1D /* Frameworks */,
+				E228A72F1F16780900E03F68 /* Products */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -90,7 +90,7 @@
 		E25EF17D1F1679F30045EA1D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				E2D0E9121F764B5E000AF870 /* MRuby.framework */,
+				E2309DBF22532AF60005CB0C /* MRuby.framework */,
 				E2206BB31F4AB3AC002BD456 /* Simple2D.framework */,
 				E25EF1901F167AF90045EA1D /* AudioToolbox.framework */,
 				E25EF1911F167AF90045EA1D /* AVFoundation.framework */,
@@ -132,7 +132,7 @@
 		E228A7261F16780900E03F68 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0910;
+				LastUpgradeCheck = 1020;
 				TargetAttributes = {
 					E228A72D1F16780900E03F68 = {
 						CreatedOnToolsVersion = 8.3.3;
@@ -141,8 +141,8 @@
 				};
 			};
 			buildConfigurationList = E228A7291F16780900E03F68 /* Build configuration list for PBXProject "MyApp" */;
-			compatibilityVersion = "Xcode 8.0";
-			developmentRegion = English;
+			compatibilityVersion = "Xcode 10.0";
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -185,6 +185,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -195,17 +196,17 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -227,11 +228,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/MRuby.framework/Headers\"";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = appletvos;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 11.1;
 			};
 			name = Debug;
 		};
@@ -239,6 +240,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -249,17 +251,17 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -275,10 +277,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/MRuby.framework/Headers\"";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = appletvos;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 11.1;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -292,9 +294,11 @@
 					/usr/local/Frameworks/Simple2D/tvOS,
 					"$(PROJECT_DIR)",
 				);
-				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/MRuby.framework/Headers\"";
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = Ruby2D.MyApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -309,9 +313,11 @@
 					/usr/local/Frameworks/Simple2D/tvOS,
 					"$(PROJECT_DIR)",
 				);
-				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/MRuby.framework/Headers\"";
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = Ruby2D.MyApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

data/assets/tvos/MyApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

data/assets/tvos/main.c

@@ -1 +1 @@
-// Your Ruby 2D app here
+// Your app here

data/ext/ruby2d/extconf.rb

@@ -2,78 +2,87 @@ require 'mkmf'
 require_relative '../../lib/ruby2d/colorize'
 
 S2D_VERSION = '1.1.0'  # Simple 2D minimum version required
-$errors = []
+$errors = []  # Array to capture errors
 
+# Print installation errors
 def print_errors
   puts "
 #{"== #{"Ruby 2D Installation Errors".error} =======================================\n"}
   #{$errors.join("\n  ")}\n
-#{"======================================================================="}"
+#{"======================================================================"}"
 end
 
-def check_s2d_version
-  unless Gem::Version.new(`bash simple2d --version`) >= Gem::Version.new(S2D_VERSION)
-    $errors << "Simple 2D needs to be updated for this version of Ruby 2D." <<
-               "Run the following, then try reinstalling this gem:\n" <<
-               "  simple2d update".bold
-    print_errors
-    exit
-  end
-end
-
-
-# Install Simple 2D on supported platforms
-case RUBY_PLATFORM
-
-# macOS
-when /darwin/
+# Check that Simple 2D is installed and meets minimum version requirements
+def check_s2d
 
   # Simple 2D not installed
   if `which simple2d`.empty?
+    $errors << "Ruby 2D uses a native library called Simple 2D, which was not found." <<
+    "To install, follow the instructions at #{"ruby2d.com/learn".bold}"
+    print_errors
+    exit
 
-    # Homebrew not installed
-    if `which brew`.empty?
-      $errors << "Ruby 2D uses a native library called Simple 2D, which was not found." <<
-                 "On macOS, it can be installed using Homebrew.\n" <<
-                 "First, install #{"Homebrew".bold}. See instructions at #{"http://brew.sh".bold}" <<
-                 "Then, run the following:\n" <<
-                 "  brew tap simple2d/tap".bold <<
-                 "  brew install simple2d".bold
-      print_errors
-      exit
-
-    # Homebrew installed, instruct to install Simple 2D
-    else
-      $errors << "Ruby 2D uses a native library called Simple 2D, which was not found." <<
-                 "Install it with Homebrew using:\n" <<
-                 "  brew tap simple2d/tap".bold <<
-                 "  brew install simple2d".bold
+  # Simple 2D installed, checking version
+  else
+    unless Gem::Version.new(`bash simple2d --version`) >= Gem::Version.new(S2D_VERSION)
+      $errors << "Simple 2D needs to be updated for this version of Ruby 2D." <<
+                 "Run the following, then try reinstalling this gem:\n" <<
+                 "  simple2d update".bold
       print_errors
       exit
     end
   end
+end
 
-# Linux and Windows / MinGW
-when /linux|mingw/
+# Use the Simple 2D, SDL, and other libraries installed by the user (not those bundled with the gem)
+def use_usr_libs
+  check_s2d
 
-  # Simple 2D not installed
-  if `which simple2d`.empty?
-    $errors << "Ruby 2D uses a native library called Simple 2D, which was not found." <<
-    "To install, follow the instructions at #{"ruby2d.com/learn".bold}"
-    print_errors
-    exit
+  # Add flags
+  $CFLAGS << ' -std=c11 -I/usr/local/include'
+  if `cat /etc/os-release` =~ /raspbian/  # Raspberry Pi
+    $CFLAGS << ' -I/opt/vc/include'
   end
+  $LDFLAGS << ' ' << `bash simple2d --libs`
+  $LDFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they cause problems
 end
 
 
-check_s2d_version
+# Build Ruby 2D native extention using libraries installed by user
+# To use install flag: `gem install ruby2d -- libs`
+if ARGV.include? 'libs'
+  use_usr_libs
 
-# Add flags
-$CFLAGS << ' -std=c11 -I/usr/local/include'
-if `cat /etc/os-release` =~ /raspbian/  # Raspberry Pi
-  $CFLAGS << ' -I/opt/vc/include'
+# Use libraries provided by the gem (default)
+else
+  $CFLAGS << ' -std=c11 -I../../assets/include'
+  case RUBY_PLATFORM
+
+  # macOS
+  when /darwin/
+    # $LDFLAGS << " -L../../assets/macos/lib -lsimple2d -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -ljpeg -lpng16 -ltiff -lwebp -lmpg123 -logg -lflac -lvorbis -lvorbisfile -lfreetype -Wl,-framework,Cocoa -Wl,-framework,ForceFeedback"
+
+    ldir = "#{Dir.pwd}/../../assets/macos/lib"
+    $LDFLAGS << " #{ldir}/libsimple2d.a #{ldir}/libSDL2.a #{ldir}/libSDL2_image.a #{ldir}/libSDL2_mixer.a #{ldir}/libSDL2_ttf.a \
+                  #{ldir}/libjpeg.a #{ldir}/libpng16.a #{ldir}/libtiff.a #{ldir}/libwebp.a \
+                  #{ldir}/libmpg123.a #{ldir}/libogg.a #{ldir}/libflac.a #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a \
+                  #{ldir}/libfreetype.a -Wl,-framework,Cocoa -Wl,-framework,ForceFeedback"
+
+  # Linux
+  when /linux/
+    # TODO: Implement static compilation for Linux
+    use_usr_libs
+
+  # Windows / MinGW
+  when /mingw/
+    $LDFLAGS << " -L../../assets/mingw/lib -lsimple2d -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lmingw32 -lopengl32 -lglew32"
+
+  # If can't detect the platform, use libraries installed by the user
+  else
+    use_usr_libs
+  end
 end
-$LDFLAGS << ' ' << `bash simple2d --libs`
-$LDFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they cause problems
 
+
+# Create the Makefile
 create_makefile('ruby2d/ruby2d')

data/ext/ruby2d/ruby2d.c

@@ -1087,7 +1087,6 @@ static R_VAL ruby2d_ext_screenshot(R_VAL self, R_VAL path) {
     S2D_Screenshot(window, RSTRING_PTR(path));
     return path;
   } else {
-    S2D_Log(S2D_WARN, "Cannot take screenshot before window is shown");
     return R_FALSE;
   }
 }

data/lib/ruby2d.rb

@@ -21,13 +21,7 @@ unless RUBY_ENGINE == 'mruby'
   require 'ruby2d/music'
 
   if RUBY_PLATFORM =~ /mingw/
-    # When using the Windows CI AppVeyor
-    if ENV['APPVEYOR']
-      s2d_dll_path = 'C:\msys64\usr\local\bin'
-    # When in a standard MinGW shell
-    else
-      s2d_dll_path = '~/../../usr/local/bin'
-    end
+    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))
   end