LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-12 08:31:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Applied LÖVE related patches to SDL2

Browse Source
This commit is contained in:
Martin Felis
2016-10-30 21:26:13 +01:00
parent f87d73671f
commit 70f63954ed
2 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/SDL2-2.0.5/Android.mk
+1 -1
View File
@@ -49,7 +49,7 @@ LOCAL_SRC_FILES := \
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
include $(BUILD_SHARED_LIBRARY)
#include $(BUILD_SHARED_LIBRARY)
###########################
#
src/org/libsdl/app/SDLActivity.java
+41 -22
View File
@@ -123,10 +123,6 @@ public class SDLActivity extends Activity {
Log.v(TAG, "onCreate(): " + mSingleton);
super.onCreate(savedInstanceState);
SDLActivity.initialize();
// So we can call stuff from static callbacks
mSingleton = this;
// Load shared libraries
String errorMsgBrokenLib = "";
try {
@@ -163,20 +159,7 @@ public class SDLActivity extends Activity {
return;
}
// Set up the surface
mSurface = new SDLSurface(getApplication());
if(Build.VERSION.SDK_INT >= 12) {
mJoystickHandler = new SDLJoystickHandler_API12();
}
else {
mJoystickHandler = new SDLJoystickHandler();
}
mLayout = new RelativeLayout(this);
mLayout.addView(mSurface);
setContentView(mLayout);
startNative();
// Get filename from "Open with" of another application
Intent intent = getIntent();
@@ -254,6 +237,21 @@ public class SDLActivity extends Activity {
return;
}
// love2d-mod-start: end main thread when opening new .love file
resetNative();
// love2d-mod-end
super.onDestroy();
// Reset everything in case the user re opens the app
SDLActivity.initialize();
}
// love2d-mod-start: end main thread when opening new .love file
/** Ends the native thread.
*/
public void resetNative() {
Log.v("SDL", "resetNative()");
// Send a quit message to the application
SDLActivity.mExitCalledFromJava = true;
SDLActivity.nativeQuit();
@@ -263,18 +261,39 @@ public class SDLActivity extends Activity {
try {
SDLActivity.mSDLThread.join();
} catch(Exception e) {
Log.v(TAG, "Problem stopping thread: " + e);
Log.v("SDL", "Problem stopping thread: " + e);
}
SDLActivity.mSDLThread = null;
//Log.v(TAG, "Finished waiting for SDL thread");
//Log.v("SDL", "Finished waiting for SDL thread");
}
super.onDestroy();
// Reset everything in case the user re opens the app
SDLActivity.initialize();
}
public void startNative() {
Log.v("SDL", "startNative()");
SDLActivity.initialize();
// So we can call stuff from static callbacks
mSingleton = this;
// Set up the surface
mSurface = new SDLSurface(getApplication());
if(Build.VERSION.SDK_INT >= 12) {
mJoystickHandler = new SDLJoystickHandler_API12();
}
else {
mJoystickHandler = new SDLJoystickHandler();
}
mLayout = new RelativeLayout(this);
mLayout.addView(mSurface);
setContentView(mLayout);
}
// love2d-mod-end
@Override
public boolean dispatchKeyEvent(KeyEvent event) {