gosu 0.7.27 → 0.7.27.1

data/Gosu/ButtonsMac.hpp

@@ -8,7 +8,7 @@ namespace Gosu
     //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
     enum ButtonName
     {
-        kbRangeBegin = 0x01,
+        kbRangeBegin = 0x00,
         kbEscape = 0x35,
         kbF1 = 0x7a,
         kbF2 = 0x78,

data/Gosu/ButtonsWin.hpp

@@ -8,7 +8,7 @@ namespace Gosu
     //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
     enum ButtonName
 	{
-        kbRangeBegin = 1,
+        kbRangeBegin = 0x00,
 		kbEscape = 0x01,
 		kbF1 = 0x3b,
 		kbF2 = 0x3c,

data/Gosu/ButtonsX.hpp

@@ -8,7 +8,7 @@ namespace Gosu
     //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
     enum ButtonName
     {
-        kbRangeBegin = 0x01,
+        kbRangeBegin = 0x00,
         kbA = 'a',
         kbB = 'b',
         kbC = 'c',

data/Gosu/Version.hpp

@@ -4,6 +4,6 @@
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
 #define GOSU_POINT_VERSION 27
-#define GOSU_VERSION "0.7.27"
+#define GOSU_VERSION "0.7.27.1"
 
 #endif

data/GosuImpl/Audio/AudioSDL.cpp

@@ -313,5 +313,5 @@ Gosu::Song::Song(Audio& audio, const std::wstring& filename)
 
 Gosu::Song::Song(Audio& audio, Type type, Reader reader)
 {
-    Song(type, reader).data.swap(data);
+    Song(reader).data.swap(data);
 }

data/GosuImpl/RubyGosu_wrap.cxx

@@ -10982,7 +10982,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(7)));
   rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(27)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.27"));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.27.1"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);

data/GosuImpl/WindowX.cpp

@@ -160,12 +160,12 @@ struct Gosu::Window::Impl
         
         if (showingCursor && !window->needsCursor())
         {
-            XUndefineCursor(display, this->window);
+            XDefineCursor(display, this->window, emptyCursor);
             showingCursor = false;
         }
         else if (!showingCursor && window->needsCursor())
         {
-            XDefineCursor(display, this->window, emptyCursor);
+            XUndefineCursor(display, this->window);
             showingCursor = true;
         }
         

data/linux/extconf.rb

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
-if defined? RUBY_PLATFORM and (RUBY_PLATFORM['-win32'] or RUBY_PLATFORM['win32-'] or RUBY_PLATFORM['mswin'] or RUBY_PLATFORM['mingw32']) then
-  puts 'This gem is not meant to be installed on Windows. If you see this message, gem made a mistake.'
-  puts 'On Windows, please use:'
+WINDOWS_HINTS = %w(-win32 win32- mswin mingw32)
+
+if defined? RUBY_PLATFORM and WINDOWS_HINTS.any? { |hint| RUBY_PLATFORM.include? hint } then
+  puts 'This gem is not meant to be installed on Windows. Instead, please use:'
   puts 'gem install gosu --platform=i386-mingw32'
   exit 1
 end
@@ -13,36 +14,55 @@ puts 'http://code.google.com/p/gosu/wiki/GettingStartedOnLinux'
 puts
 
 # FIXME should reversely filter out files ending in Win, Mac, Touch, AL etc.
-SOURCE_FILES =
-    %w(Math.cpp Utility.cpp IO.cpp FileUnix.cpp InputX.cpp TextInputX.cpp TimingUnix.cpp WindowX.cpp
-	     Graphics/Bitmap.cpp Graphics/BitmapUtils.cpp Graphics/Color.cpp
-	     Graphics/TexChunk.cpp Graphics/Graphics.cpp Graphics/Image.cpp
-	     Graphics/BlockAllocator.cpp Inspection.cpp
-	     Graphics/Texture.cpp Graphics/LargeImageData.cpp
-	     Graphics/BitmapPNG.cpp Graphics/Font.cpp Graphics/BitmapBMP.cpp
-	     Graphics/TextUnix.cpp Graphics/Text.cpp Graphics/Transform.cpp
-	     Graphics/BitmapColorKey.cpp DirectoriesUnix.cpp
-	     Audio/AudioAudiere.cpp RubyGosu_wrap.cxx)
+SOURCE_FILES = %w(
+  Audio/AudioSDL.cpp
+  DirectoriesUnix.cpp
+  FileUnix.cpp
+  Graphics/Bitmap.cpp
+  Graphics/BitmapBMP.cpp
+  Graphics/BitmapColorKey.cpp
+  Graphics/BitmapPNG.cpp
+  Graphics/BitmapUtils.cpp
+  Graphics/BlockAllocator.cpp
+  Graphics/Color.cpp
+  Graphics/Font.cpp
+  Graphics/Graphics.cpp
+  Graphics/Image.cpp
+  Graphics/LargeImageData.cpp
+  Graphics/TexChunk.cpp
+  Graphics/Text.cpp
+  Graphics/TextUnix.cpp
+  Graphics/Texture.cpp
+  Graphics/Transform.cpp
+  InputX.cpp
+  Inspection.cpp
+  IO.cpp
+  Math.cpp
+  RubyGosu_wrap.cxx
+  TextInputX.cpp
+  TimingUnix.cpp
+  Utility.cpp
+  WindowX.cpp
+)
 
 require 'mkmf'
 
 # Copy all relevant C++ files into the current directory
-# FIXME could be done by gem packager
+# FIXME Could be done by gem task instead.
 SOURCE_FILES.each { |file| `cp ../GosuImpl/#{file} #{File.basename(file)}` }
 
 # Symlink our pretty gosu.so into ../lib
-# FIXME gosu.rb should just look in the right place
+# FIXME gosu.rb should just look in the right place.
 `ln -s ../linux/gosu.so ../lib/gosu.so`
 
 sdl_config = with_config("sdl-config", "sdl-config")
-audiere_config = with_config("audiere-config", "audiere-config")
-pango_config = "pkg-config pangoft2" # FIXME should probably use with_config
+pango_config = "pkg-config pangoft2"
 
-$INCFLAGS << " -I../ -I../GosuImpl `#{sdl_config} --cflags` `#{audiere_config} --cxxflags` `#{pango_config} --cflags`"
-$LDFLAGS << " `#{sdl_config} --libs` `#{audiere_config} --libs` `#{pango_config} --libs` -lX11"
+$INCFLAGS << " -I../ -I../GosuImpl `#{sdl_config} --cflags` `#{pango_config} --cflags`"
+$LDFLAGS << " `#{sdl_config} --libs` `#{pango_config} --libs` -lX11"
+have_header('SDL_mixer.h') if have_library('SDL_mixer', 'Mix_OpenAudio')
 have_header('SDL_ttf.h') if have_library('SDL_ttf', 'TTF_RenderUTF8_Blended')
 have_header('gl.h') if have_library('GL', 'glMatrixMode')
 have_header('png.h') if have_library('png', 'png_sig_cmp')
 
 create_makefile("gosu")
-

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 7
   - 27
-  version: 0.7.27
+  - 1
+  version: 0.7.27.1
 platform: ruby
 authors: 
 - Julian Raschke
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 +08:00
+date: 2011-02-07 00:00:00 +08:00
 default_executable: 
 dependencies: []