From c61b4fec473abde50d984b561e5091859caae6f4 Mon Sep 17 00:00:00 2001
From: groogy <groogy@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Fri, 3 Dec 2010 11:27:38 +0000
Subject: [PATCH] Changed so that we use the static libraries of SFML instead
 to reduce the dependency when you want to distribute your ruby applications.
 Also seems like that my sfml-all wasn't committed. Should be done now.

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1734 4e206d99-4929-0410-ac5d-dfc041789085
---
 bindings/ruby/sfml-all/extconf.rb             | 25 +++++++++++++++++++
 bindings/ruby/sfml-audio/extconf.rb           |  2 +-
 bindings/ruby/sfml-graphics/extconf.rb        |  2 +-
 bindings/ruby/sfml-system/extconf.rb          |  2 +-
 bindings/ruby/sfml-system/system/main.hpp     |  2 ++
 bindings/ruby/sfml-window/extconf.rb          |  2 +-
 .../ruby/sfml-window/window/VideoMode.cpp     |  1 -
 7 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 bindings/ruby/sfml-all/extconf.rb

diff --git a/bindings/ruby/sfml-all/extconf.rb b/bindings/ruby/sfml-all/extconf.rb
new file mode 100644
index 000000000..fe646823c
--- /dev/null
+++ b/bindings/ruby/sfml-all/extconf.rb
@@ -0,0 +1,25 @@
+# rbSFML - Copyright (c) 2010 Henrik Valter Vogelius Hansson - groogy@groogy.se
+# This software is provided 'as-is', without any express or
+# implied warranty. In no event will the authors be held
+# liable for any damages arising from the use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute
+# it freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented;
+#    you must not claim that you wrote the original software.
+#    If you use this software in a product, an acknowledgment
+#    in the product documentation would be appreciated but
+#    is not required.
+#
+# 2. Altered source versions must be plainly marked as such,
+#    and must not be misrepresented as being the original software.
+#
+# 3. This notice may not be removed or altered from any
+#    source distribution.
+
+require 'mkmf'
+
+dir_config("all")
+create_makefile("sfml/all", "all")
diff --git a/bindings/ruby/sfml-audio/extconf.rb b/bindings/ruby/sfml-audio/extconf.rb
index d54983bb1..73175b9a1 100644
--- a/bindings/ruby/sfml-audio/extconf.rb
+++ b/bindings/ruby/sfml-audio/extconf.rb
@@ -22,6 +22,6 @@
 require 'mkmf'
 
 dir_config("audio")
-have_library("sfml-audio")
+have_library("sfml-audio-s")
 find_header("main.hpp", "../sfml-system/system")
 create_makefile("sfml/audio", "audio")
diff --git a/bindings/ruby/sfml-graphics/extconf.rb b/bindings/ruby/sfml-graphics/extconf.rb
index b93a5ce24..ba1b9d817 100644
--- a/bindings/ruby/sfml-graphics/extconf.rb
+++ b/bindings/ruby/sfml-graphics/extconf.rb
@@ -22,6 +22,6 @@
 require 'mkmf'
 
 dir_config("graphics")
-have_library("sfml-graphics")
+have_library("sfml-graphics-s")
 find_header("main.hpp", "../sfml-system/system")
 create_makefile("sfml/graphics", "graphics")
diff --git a/bindings/ruby/sfml-system/extconf.rb b/bindings/ruby/sfml-system/extconf.rb
index 16969709c..0daf5368b 100644
--- a/bindings/ruby/sfml-system/extconf.rb
+++ b/bindings/ruby/sfml-system/extconf.rb
@@ -22,5 +22,5 @@
 require 'mkmf'
 
 dir_config("system")
-have_library("sfml-system") 
+have_library("sfml-system-s") 
 create_makefile("sfml/system", "system")
diff --git a/bindings/ruby/sfml-system/system/main.hpp b/bindings/ruby/sfml-system/system/main.hpp
index 03dd743ae..c6a981fb5 100644
--- a/bindings/ruby/sfml-system/system/main.hpp
+++ b/bindings/ruby/sfml-system/system/main.hpp
@@ -25,6 +25,8 @@
 
 #include "ruby.h"
 
+#define SFML_STATIC
+
 VALUE RetrieveSFMLClass( const char * aName );
 
 // Ruby initiation function
diff --git a/bindings/ruby/sfml-window/extconf.rb b/bindings/ruby/sfml-window/extconf.rb
index 84dfbf840..e4be2ba97 100644
--- a/bindings/ruby/sfml-window/extconf.rb
+++ b/bindings/ruby/sfml-window/extconf.rb
@@ -22,6 +22,6 @@
 require 'mkmf'
 
 dir_config("window")
-have_library("sfml-window") 
+have_library("sfml-window-s") 
 find_header("main.hpp", "../sfml-system/system")
 create_makefile("sfml/window", "window")
diff --git a/bindings/ruby/sfml-window/window/VideoMode.cpp b/bindings/ruby/sfml-window/window/VideoMode.cpp
index b20c4f82b..a53050f1d 100644
--- a/bindings/ruby/sfml-window/window/VideoMode.cpp
+++ b/bindings/ruby/sfml-window/window/VideoMode.cpp
@@ -23,7 +23,6 @@
 #include "VideoMode.hpp"
 #include "main.hpp"
 #include <SFML/Window/VideoMode.hpp>
-#include <iostream>
 
 VALUE globalVideoModeClass;