Imported Upstream version 2.2.0+dfsg

1 files changed, 99 insertions, 83 deletions

diff --git a/src/SFML/System/CMakeLists.txt b/src/SFML/System/CMakeLists.txt
index 5ef9139..74c95de 100644
--- a/src/SFML/System/CMakeLists.txt
+++ b/src/SFML/System/CMakeLists.txt
@@ -1,83 +1,99 @@
-

-set(INCROOT ${PROJECT_SOURCE_DIR}/include/SFML/System)

-set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/System)

-

-# all source files

-set(SRC

-    ${SRCROOT}/Clock.cpp

-    ${INCROOT}/Clock.hpp

-    ${SRCROOT}/Err.cpp

-    ${INCROOT}/Err.hpp

-    ${INCROOT}/Export.hpp

-    ${INCROOT}/InputStream.hpp

-    ${SRCROOT}/Lock.cpp

-    ${INCROOT}/Lock.hpp

-    ${SRCROOT}/Mutex.cpp

-    ${INCROOT}/Mutex.hpp

-    ${INCROOT}/NonCopyable.hpp

-    ${SRCROOT}/Sleep.cpp

-    ${INCROOT}/Sleep.hpp

-    ${SRCROOT}/String.cpp

-    ${INCROOT}/String.hpp

-    ${SRCROOT}/Thread.cpp

-    ${INCROOT}/Thread.hpp

-    ${INCROOT}/Thread.inl

-    ${SRCROOT}/ThreadLocal.cpp

-    ${INCROOT}/ThreadLocal.hpp

-    ${INCROOT}/ThreadLocalPtr.hpp

-    ${INCROOT}/ThreadLocalPtr.inl

-    ${SRCROOT}/Time.cpp

-    ${INCROOT}/Time.hpp

-    ${INCROOT}/Utf.hpp

-    ${INCROOT}/Utf.inl

-    ${INCROOT}/Vector2.hpp

-    ${INCROOT}/Vector2.inl

-    ${INCROOT}/Vector3.hpp

-    ${INCROOT}/Vector3.inl

-)

-source_group("" FILES ${SRC})

-

-# add platform specific sources

-if(WINDOWS)

-    set(PLATFORM_SRC

-        ${SRCROOT}/Win32/ClockImpl.cpp

-        ${SRCROOT}/Win32/ClockImpl.hpp

-        ${SRCROOT}/Win32/MutexImpl.cpp

-        ${SRCROOT}/Win32/MutexImpl.hpp

-        ${SRCROOT}/Win32/SleepImpl.cpp

-        ${SRCROOT}/Win32/SleepImpl.hpp

-        ${SRCROOT}/Win32/ThreadImpl.cpp

-        ${SRCROOT}/Win32/ThreadImpl.hpp

-        ${SRCROOT}/Win32/ThreadLocalImpl.cpp

-        ${SRCROOT}/Win32/ThreadLocalImpl.hpp

-    )

-    source_group("windows" FILES ${PLATFORM_SRC})

-else()

-    set(PLATFORM_SRC

-        ${SRCROOT}/Unix/ClockImpl.cpp

-        ${SRCROOT}/Unix/ClockImpl.hpp

-        ${SRCROOT}/Unix/MutexImpl.cpp

-        ${SRCROOT}/Unix/MutexImpl.hpp

-        ${SRCROOT}/Unix/SleepImpl.cpp

-        ${SRCROOT}/Unix/SleepImpl.hpp

-        ${SRCROOT}/Unix/ThreadImpl.cpp

-        ${SRCROOT}/Unix/ThreadImpl.hpp

-        ${SRCROOT}/Unix/ThreadLocalImpl.cpp

-        ${SRCROOT}/Unix/ThreadLocalImpl.hpp

-    )

-    source_group("unix" FILES ${PLATFORM_SRC})

-endif()

-

-# build the list of external libraries to link

-set(SYSTEM_EXT_LIBS)

-if(UNIX)

-    set(SYSTEM_EXT_LIBS ${SYSTEM_EXT_LIBS} pthread)

-endif()

-if(LINUX)

-    set(SYSTEM_EXT_LIBS ${SYSTEM_EXT_LIBS} rt)

-endif()

-

-# define the sfml-system target

-sfml_add_library(sfml-system

-                 SOURCES ${SRC} ${PLATFORM_SRC}

-                 EXTERNAL_LIBS ${SYSTEM_EXT_LIBS})

+
+set(INCROOT ${PROJECT_SOURCE_DIR}/include/SFML/System)
+set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/System)
+
+# all source files
+set(SRC
+    ${SRCROOT}/Clock.cpp
+    ${INCROOT}/Clock.hpp
+    ${SRCROOT}/Err.cpp
+    ${INCROOT}/Err.hpp
+    ${INCROOT}/Export.hpp
+    ${INCROOT}/InputStream.hpp
+    ${SRCROOT}/Lock.cpp
+    ${INCROOT}/Lock.hpp
+    ${SRCROOT}/Mutex.cpp
+    ${INCROOT}/Mutex.hpp
+    ${INCROOT}/NonCopyable.hpp
+    ${SRCROOT}/Sleep.cpp
+    ${INCROOT}/Sleep.hpp
+    ${SRCROOT}/String.cpp
+    ${INCROOT}/String.hpp
+    ${INCROOT}/String.inl
+    ${SRCROOT}/Thread.cpp
+    ${INCROOT}/Thread.hpp
+    ${INCROOT}/Thread.inl
+    ${SRCROOT}/ThreadLocal.cpp
+    ${INCROOT}/ThreadLocal.hpp
+    ${INCROOT}/ThreadLocalPtr.hpp
+    ${INCROOT}/ThreadLocalPtr.inl
+    ${SRCROOT}/Time.cpp
+    ${INCROOT}/Time.hpp
+    ${INCROOT}/Utf.hpp
+    ${INCROOT}/Utf.inl
+    ${INCROOT}/Vector2.hpp
+    ${INCROOT}/Vector2.inl
+    ${INCROOT}/Vector3.hpp
+    ${INCROOT}/Vector3.inl
+)
+source_group("" FILES ${SRC})
+
+# add platform specific sources
+if(SFML_OS_WINDOWS)
+    set(PLATFORM_SRC
+        ${SRCROOT}/Win32/ClockImpl.cpp
+        ${SRCROOT}/Win32/ClockImpl.hpp
+        ${SRCROOT}/Win32/MutexImpl.cpp
+        ${SRCROOT}/Win32/MutexImpl.hpp
+        ${SRCROOT}/Win32/SleepImpl.cpp
+        ${SRCROOT}/Win32/SleepImpl.hpp
+        ${SRCROOT}/Win32/ThreadImpl.cpp
+        ${SRCROOT}/Win32/ThreadImpl.hpp
+        ${SRCROOT}/Win32/ThreadLocalImpl.cpp
+        ${SRCROOT}/Win32/ThreadLocalImpl.hpp
+    )
+    source_group("windows" FILES ${PLATFORM_SRC})
+else()
+    set(PLATFORM_SRC
+        ${SRCROOT}/Unix/ClockImpl.cpp
+        ${SRCROOT}/Unix/ClockImpl.hpp
+        ${SRCROOT}/Unix/MutexImpl.cpp
+        ${SRCROOT}/Unix/MutexImpl.hpp
+        ${SRCROOT}/Unix/SleepImpl.cpp
+        ${SRCROOT}/Unix/SleepImpl.hpp
+        ${SRCROOT}/Unix/ThreadImpl.cpp
+        ${SRCROOT}/Unix/ThreadImpl.hpp
+        ${SRCROOT}/Unix/ThreadLocalImpl.cpp
+        ${SRCROOT}/Unix/ThreadLocalImpl.hpp
+    )
+
+    if(SFML_OS_ANDROID)
+        set(PLATFORM_SRC ${PLATFORM_SRC}
+            ${SRCROOT}/Android/Activity.hpp
+            ${SRCROOT}/Android/Activity.cpp
+            ${SRCROOT}/Android/ResourceStream.cpp
+            ${SRCROOT}/Android/ResourceStream.cpp
+        )
+    endif()
+
+    source_group("unix" FILES ${PLATFORM_SRC})
+endif()
+
+# build the list of external libraries to link
+if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOSX)
+    list(APPEND SYSTEM_EXT_LIBS pthread)
+endif()
+if(SFML_OS_LINUX)
+    list(APPEND SYSTEM_EXT_LIBS rt)
+endif()
+if(SFML_OS_WINDOWS)
+    list(APPEND SYSTEM_EXT_LIBS winmm)
+endif()
+if(SFML_OS_ANDROID)
+    list(APPEND SYSTEM_EXT_LIBS android log)
+endif()
+
+# define the sfml-system target
+sfml_add_library(sfml-system
+                 SOURCES ${SRC} ${PLATFORM_SRC}
+                 EXTERNAL_LIBS ${SYSTEM_EXT_LIBS})