Imported Upstream version 2.2.0+dfsg

1 files changed, 193 insertions, 159 deletions

diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp
index 933cd11..a5ad154 100644
--- a/include/SFML/Config.hpp
+++ b/include/SFML/Config.hpp
@@ -1,159 +1,193 @@
-////////////////////////////////////////////////////////////

-//

-// SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)

-//

-// 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.

-//

-////////////////////////////////////////////////////////////

-

-#ifndef SFML_CONFIG_HPP

-#define SFML_CONFIG_HPP

-

-

-////////////////////////////////////////////////////////////

-// Define the SFML version

-////////////////////////////////////////////////////////////

-#define SFML_VERSION_MAJOR 2

-#define SFML_VERSION_MINOR 1

-

-

-////////////////////////////////////////////////////////////

-// Identify the operating system

-////////////////////////////////////////////////////////////

-#if defined(_WIN32) || defined(__WIN32__)

-

-    // Windows

-    #define SFML_SYSTEM_WINDOWS

-    #ifndef NOMINMAX

-        #define NOMINMAX

-    #endif

-

-#elif defined(linux) || defined(__linux)

-

-    // Linux

-    #define SFML_SYSTEM_LINUX

-

-#elif defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || defined(Macintosh)

-

-    // MacOS

-    #define SFML_SYSTEM_MACOS

-

-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

-

-    // FreeBSD

-    #define SFML_SYSTEM_FREEBSD

-

-#else

-

-    // Unsupported system

-    #error This operating system is not supported by SFML library

-

-#endif

-

-

-////////////////////////////////////////////////////////////

-// Define a portable debug macro

-////////////////////////////////////////////////////////////

-#if !defined(NDEBUG)

-

-    #define SFML_DEBUG

-

-#endif

-

-

-////////////////////////////////////////////////////////////

-// Define helpers to create portable import / export macros for each module

-////////////////////////////////////////////////////////////

-#if !defined(SFML_STATIC)

-

-    #if defined(SFML_SYSTEM_WINDOWS)

-

-        // Windows compilers need specific (and different) keywords for export and import

-        #define SFML_API_EXPORT __declspec(dllexport)

-        #define SFML_API_IMPORT __declspec(dllimport)

-

-        // For Visual C++ compilers, we also need to turn off this annoying C4251 warning

-        #ifdef _MSC_VER

-

-            #pragma warning(disable : 4251)

-

-        #endif

-

-    #else // Linux, FreeBSD, Mac OS X

-

-        #if __GNUC__ >= 4

-

-            // GCC 4 has special keywords for showing/hidding symbols,

-            // the same keyword is used for both importing and exporting

-            #define SFML_API_EXPORT __attribute__ ((__visibility__ ("default")))

-            #define SFML_API_IMPORT __attribute__ ((__visibility__ ("default")))

-

-        #else

-

-            // GCC < 4 has no mechanism to explicitely hide symbols, everything's exported

-            #define SFML_API_EXPORT

-            #define SFML_API_IMPORT

-

-        #endif

-

-    #endif

-

-#else

-

-    // Static build doesn't need import/export macros

-    #define SFML_API_EXPORT

-    #define SFML_API_IMPORT

-

-#endif

-

-

-////////////////////////////////////////////////////////////

-// Define portable fixed-size types

-////////////////////////////////////////////////////////////

-namespace sf

-{

-    // All "common" platforms use the same size for char, short and int

-    // (basically there are 3 types for 3 sizes, so no other match is possible),

-    // we can use them without doing any kind of check

-

-    // 8 bits integer types

-    typedef signed   char Int8;

-    typedef unsigned char Uint8;

-

-    // 16 bits integer types

-    typedef signed   short Int16;

-    typedef unsigned short Uint16;

-

-    // 32 bits integer types

-    typedef signed   int Int32;

-    typedef unsigned int Uint32;

-

-    // 64 bits integer types

-    #if defined(_MSC_VER)

-        typedef signed   __int64 Int64;

-        typedef unsigned __int64 Uint64;

-    #else

-        typedef signed   long long Int64;

-        typedef unsigned long long Uint64;

-    #endif

-

-} // namespace sf

-

-

-#endif // SFML_CONFIG_HPP

+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2014 Laurent Gomila (laurent.gom@gmail.com)
+//
+// 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.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_CONFIG_HPP
+#define SFML_CONFIG_HPP
+
+
+////////////////////////////////////////////////////////////
+// Define the SFML version
+////////////////////////////////////////////////////////////
+#define SFML_VERSION_MAJOR 2
+#define SFML_VERSION_MINOR 2
+#define SFML_VERSION_PATCH 0
+
+
+////////////////////////////////////////////////////////////
+// Identify the operating system
+// see http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system
+////////////////////////////////////////////////////////////
+#if defined(_WIN32)
+
+    // Windows
+    #define SFML_SYSTEM_WINDOWS
+    #ifndef NOMINMAX
+        #define NOMINMAX
+    #endif
+
+#elif defined(__APPLE__) && defined(__MACH__)
+
+    // Apple platform, see which one it is
+    #include "TargetConditionals.h"
+
+    #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+
+        // iOS
+        #define SFML_SYSTEM_IOS
+
+    #elif TARGET_OS_MAC
+
+        // MacOS
+        #define SFML_SYSTEM_MACOS
+
+    #else
+
+        // Unsupported Apple system
+        #error This Apple operating system is not supported by SFML library
+
+    #endif
+
+#elif defined(__unix__)
+
+    // UNIX system, see which one it is
+    #if defined(__ANDROID__)
+
+        // Android
+        #define SFML_SYSTEM_ANDROID
+
+    #elif defined(__linux__)
+
+         // Linux
+        #define SFML_SYSTEM_LINUX
+
+    #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+
+        // FreeBSD
+        #define SFML_SYSTEM_FREEBSD
+
+    #else
+
+        // Unsupported UNIX system
+        #error This UNIX operating system is not supported by SFML library
+
+    #endif
+
+#else
+
+    // Unsupported system
+    #error This operating system is not supported by SFML library
+
+#endif
+
+
+////////////////////////////////////////////////////////////
+// Define a portable debug macro
+////////////////////////////////////////////////////////////
+#if !defined(NDEBUG)
+
+    #define SFML_DEBUG
+
+#endif
+
+
+////////////////////////////////////////////////////////////
+// Define helpers to create portable import / export macros for each module
+////////////////////////////////////////////////////////////
+#if !defined(SFML_STATIC)
+
+    #if defined(SFML_SYSTEM_WINDOWS)
+
+        // Windows compilers need specific (and different) keywords for export and import
+        #define SFML_API_EXPORT __declspec(dllexport)
+        #define SFML_API_IMPORT __declspec(dllimport)
+
+        // For Visual C++ compilers, we also need to turn off this annoying C4251 warning
+        #ifdef _MSC_VER
+
+            #pragma warning(disable: 4251)
+
+        #endif
+
+    #else // Linux, FreeBSD, Mac OS X
+
+        #if __GNUC__ >= 4
+
+            // GCC 4 has special keywords for showing/hidding symbols,
+            // the same keyword is used for both importing and exporting
+            #define SFML_API_EXPORT __attribute__ ((__visibility__ ("default")))
+            #define SFML_API_IMPORT __attribute__ ((__visibility__ ("default")))
+
+        #else
+
+            // GCC < 4 has no mechanism to explicitely hide symbols, everything's exported
+            #define SFML_API_EXPORT
+            #define SFML_API_IMPORT
+
+        #endif
+
+    #endif
+
+#else
+
+    // Static build doesn't need import/export macros
+    #define SFML_API_EXPORT
+    #define SFML_API_IMPORT
+
+#endif
+
+
+////////////////////////////////////////////////////////////
+// Define portable fixed-size types
+////////////////////////////////////////////////////////////
+namespace sf
+{
+    // All "common" platforms use the same size for char, short and int
+    // (basically there are 3 types for 3 sizes, so no other match is possible),
+    // we can use them without doing any kind of check
+
+    // 8 bits integer types
+    typedef signed   char Int8;
+    typedef unsigned char Uint8;
+
+    // 16 bits integer types
+    typedef signed   short Int16;
+    typedef unsigned short Uint16;
+
+    // 32 bits integer types
+    typedef signed   int Int32;
+    typedef unsigned int Uint32;
+
+    // 64 bits integer types
+    #if defined(_MSC_VER)
+        typedef signed   __int64 Int64;
+        typedef unsigned __int64 Uint64;
+    #else
+        typedef signed   long long Int64;
+        typedef unsigned long long Uint64;
+    #endif
+
+} // namespace sf
+
+
+#endif // SFML_CONFIG_HPP