From 214c9b06621f3f874917fba2a96c28727f5e2da3 Mon Sep 17 00:00:00 2001 From: Jonathan De Wachter Date: Sat, 21 Jun 2014 21:04:24 +0200 Subject: [PATCH] [Android] Removed dependency on the window module from libsfml-main.a --- src/SFML/Main/MainAndroid.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/SFML/Main/MainAndroid.cpp b/src/SFML/Main/MainAndroid.cpp index fdfbd826..d835e38f 100644 --- a/src/SFML/Main/MainAndroid.cpp +++ b/src/SFML/Main/MainAndroid.cpp @@ -38,8 +38,6 @@ #ifdef SFML_SYSTEM_ANDROID -#include -#include #include #include #include @@ -195,7 +193,7 @@ static void onDestroy(ANativeActivity* activity) states->mutex.unlock(); // Terminate EGL display - eglCheck(eglTerminate(states->display)); + eglTerminate(states->display); // Delete our allocated states delete states; @@ -369,8 +367,8 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_ for (unsigned int i = 0; i < sf::Mouse::ButtonCount; i++) states->isButtonPressed[i] = false; - - states->display = eglCheck(eglGetDisplay(EGL_DEFAULT_DISPLAY)); + + states->display = eglGetDisplay(EGL_DEFAULT_DISPLAY); // As the input queue will be created before the SFML window, we need to use // this dummy function that will be replaced later by the first created @@ -418,7 +416,7 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_ states->activity = activity; // Initialize the display - eglCheck(eglInitialize(states->display, NULL, NULL)); + eglInitialize(states->display, NULL, NULL); // Launch the main thread sf::Thread* thread = new sf::Thread(sf::priv::main, states);