Changed name of System.* to main.* since I will otherwise have a big problem with file/name collision in other libraries.

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1597 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
groogy 2010-11-03 10:06:01 +00:00
parent e0b1a7a53f
commit 5219f332b4
5 changed files with 7 additions and 7 deletions

View File

@ -21,7 +21,7 @@
*/ */
#include "Clock.hpp" #include "Clock.hpp"
#include "System.hpp" #include "main.hpp"
#include <SFML/System/Clock.hpp> #include <SFML/System/Clock.hpp>
/* Utility class for manipulating time. */ /* Utility class for manipulating time. */

View File

@ -21,7 +21,7 @@
*/ */
#include "Vector2.hpp" #include "Vector2.hpp"
#include "System.hpp" #include "main.hpp"
/* SFML::Vector2 is a simple class that defines a mathematical vector with two coordinates (x and y). /* SFML::Vector2 is a simple class that defines a mathematical vector with two coordinates (x and y).
* *

View File

@ -21,7 +21,7 @@
*/ */
#include "Vector3.hpp" #include "Vector3.hpp"
#include "System.hpp" #include "main.hpp"
/* SFML::Vector3 is a simple class that defines a mathematical vector with three coordinates (x, y and z). /* SFML::Vector3 is a simple class that defines a mathematical vector with three coordinates (x, y and z).
* *

View File

@ -20,7 +20,7 @@
* source distribution. * source distribution.
*/ */
#include "System.hpp" #include "main.hpp"
#include "Clock.hpp" #include "Clock.hpp"
#include "Vector2.hpp" #include "Vector2.hpp"
#include "Vector3.hpp" #include "Vector3.hpp"

View File

@ -20,8 +20,8 @@
* source distribution. * source distribution.
*/ */
#ifndef SFML_RUBYEXT_SYSTEM_HEADER_ #ifndef SFML_RUBYEXT_MAIN_HEADER_
#define SFML_RUBYEXT_SYSTEM_HEADER_ #define SFML_RUBYEXT_MAIN_HEADER_
#include "ruby.h" #include "ruby.h"
@ -34,4 +34,4 @@ typedef VALUE ( *RubyFunctionPtr )( ... );
#define FUNCPTR( x ) ( reinterpret_cast< RubyFunctionPtr >( x ) ) #define FUNCPTR( x ) ( reinterpret_cast< RubyFunctionPtr >( x ) )
#endif // SFML_RUBYEXT_SYSTEM_HEADER_ #endif // SFML_RUBYEXT_MAIN_HEADER_