mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-29 06:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compile errors in SensorImpl.mm and with EGL stuff on iOS

Browse Source
This commit is contained in:
Laurent 2014-04-07 23:28:22 +02:00 committed by Jonathan De Wachter
parent 80431deef4
commit 03acb2ad9f
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SFML/Window/CMakeLists.txt
View File

@ -40,7 +40,7 @@ set(SRC
${SRCROOT}/WindowImpl.hpp ${SRCROOT}/WindowImpl.hpp
${INCROOT}/WindowStyle.hpp ${INCROOT}/WindowStyle.hpp
) )
if(SFML_OPENGL_ES) if(SFML_OPENGL_ES AND NOT SFML_OS_IOS)
list(APPEND SRC ${SRCROOT}/EGLCheck.cpp) list(APPEND SRC ${SRCROOT}/EGLCheck.cpp)
list(APPEND SRC ${SRCROOT}/EGLCheck.hpp) list(APPEND SRC ${SRCROOT}/EGLCheck.hpp)
list(APPEND SRC ${SRCROOT}/EglContext.cpp) list(APPEND SRC ${SRCROOT}/EglContext.cpp)

7
src/SFML/Window/iOS/JoystickImpl.hpp
View File

@ -96,13 +96,6 @@ public :
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
JoystickState update(); JoystickState update();
private :
////////////////////////////////////////////////////////////
// Member data
////////////////////////////////////////////////////////////
int m_index; ///< Index of the joystick
}; };
} // namespace priv } // namespace priv

3
src/SFML/Window/iOS/SensorImpl.mm
View File

@ -26,6 +26,7 @@
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Window/SensorImpl.hpp> #include <SFML/Window/SensorImpl.hpp>
#include <SFML/Window/iOS/SFAppDelegate.hpp>
namespace namespace
@ -186,7 +187,7 @@ void SensorImpl::setEnabled(bool enabled)
if (enabled == m_enabled) if (enabled == m_enabled)
return; return;
switch (index) switch (m_sensor)
{ {
case Sensor::Accelerometer: case Sensor::Accelerometer:
if (enabled) if (enabled)