lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Android] Dropped stlport in favor of libc++ which supports C++11

Browse source
This commit is contained in:
Jonathan De Wachter 2014-02-27 11:31:10 +01:00
parent a1b0e73ac5
commit 2caec961ee
20 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/SFML/Main/SFMLActivity.cpp
View file

@ -171,7 +171,7 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_
jobject ObjectActivityInfo = lJNIEnv->CallObjectMethod(ObjectPackageManager, MethodGetActivityInfo, ObjectComponentName, (jint)128);
// Load our libraries in reverse order
loadLibrary("stlport_shared", lJNIEnv, ObjectActivityInfo);
loadLibrary("c++_shared", lJNIEnv, ObjectActivityInfo);
loadLibrary("sfml-system", lJNIEnv, ObjectActivityInfo);
loadLibrary("sfml-window", lJNIEnv, ObjectActivityInfo);
loadLibrary("sfml-graphics", lJNIEnv, ObjectActivityInfo);

2
src/SFML/Window/Android/WindowImplAndroid.cpp
View file

@ -51,7 +51,7 @@ WindowImplAndroid::WindowImplAndroid(WindowHandle handle)
////////////////////////////////////////////////////////////
WindowImplAndroid::WindowImplAndroid(VideoMode mode, const std::string& title, unsigned long style, const ContextSettings& settings)
WindowImplAndroid::WindowImplAndroid(VideoMode mode, const String& title, unsigned long style, const ContextSettings& settings)
{
ActivityStates* states = getActivity(NULL);
Lock lock(states->mutex);

2
src/SFML/Window/Android/WindowImplAndroid.hpp
View file

@ -64,7 +64,7 @@ public :
/// \param settings Additional settings for the underlying OpenGL context
///
////////////////////////////////////////////////////////////
WindowImplAndroid(VideoMode mode, const std::string& title, unsigned long style, const ContextSettings& settings);
WindowImplAndroid(VideoMode mode, const String& title, unsigned long style, const ContextSettings& settings);
////////////////////////////////////////////////////////////
/// \brief Destructor