ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a crash on exit

Browse Source
This commit is contained in:
Deve 2018-07-27 00:05:39 +02:00
parent b7a11e68ad
commit ef27fdaba8
8 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/Android.mk
View File

@ -126,7 +126,7 @@ LOCAL_PATH := .
LOCAL_CPP_FEATURES += rtti LOCAL_CPP_FEATURES += rtti
LOCAL_SRC_FILES := $(wildcard ../lib/irrlicht/source/Irrlicht/*.cpp) \ LOCAL_SRC_FILES := $(wildcard ../lib/irrlicht/source/Irrlicht/*.cpp) \
$(wildcard ../lib/irrlicht/source/Irrlicht/Android/*.cpp) \ $(wildcard ../lib/irrlicht/source/Irrlicht/Android/*.cpp) \
../lib/irrlicht/source/Irrlicht/android_native_app_glue.c ../lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.c
LOCAL_CFLAGS := -I../lib/irrlicht/source/Irrlicht/ \ LOCAL_CFLAGS := -I../lib/irrlicht/source/Irrlicht/ \
-I../lib/irrlicht/include/ \ -I../lib/irrlicht/include/ \
-Iobj/jpeglib/ \ -Iobj/jpeglib/ \

2
lib/irrlicht/source/Irrlicht/CContextEGL.cpp
View File

@ -25,7 +25,7 @@
#include <vector> #include <vector>
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_ #ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
#include <android_native_app_glue.h> #include "stk_android_native_app_glue.h"
#endif #endif
#include "CContextEGL.h" #include "CContextEGL.h"

2
lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.h
View File

@ -12,7 +12,7 @@
#include <android/window.h> #include <android/window.h>
#include <android/sensor.h> #include <android/sensor.h>
#include <android_native_app_glue.h> #include "stk_android_native_app_glue.h"
#include "CIrrDeviceStub.h" #include "CIrrDeviceStub.h"
#include "IrrlichtDevice.h" #include "IrrlichtDevice.h"
#include "IImagePresenter.h" #include "IImagePresenter.h"

2
lib/irrlicht/source/Irrlicht/COGLES2Driver.h
View File

@ -27,7 +27,7 @@
#include <OpenGLES/ES2/glext.h> #include <OpenGLES/ES2/glext.h>
#elif defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) #elif defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_)
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "android_native_app_glue.h" #include "stk_android_native_app_glue.h"
#endif #endif
#include "CNullDriver.h" #include "CNullDriver.h"

2
lib/irrlicht/source/Irrlicht/android_native_app_glue.c → lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.c
View File

@ -24,7 +24,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/resource.h> #include <sys/resource.h>
#include "android_native_app_glue.h" #include "stk_android_native_app_glue.h"
#include <android/log.h> #include <android/log.h>
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "threaded_app", __VA_ARGS__)) #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "threaded_app", __VA_ARGS__))

0
lib/irrlicht/source/Irrlicht/android_native_app_glue.h → lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.h
View File

2
src/guiengine/event_handler.cpp
View File

@ -44,7 +44,7 @@
#include <iostream> #include <iostream>
#ifdef ANDROID #ifdef ANDROID
#include <android_native_app_glue.h> #include "../../../lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.h"
#endif #endif
using GUIEngine::EventHandler; using GUIEngine::EventHandler;

2
src/main_android.hpp
View File

@ -20,7 +20,7 @@
#ifdef ANDROID #ifdef ANDROID
#include <android_native_app_glue.h> #include "../../../lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.h"
extern struct android_app* global_android_app; extern struct android_app* global_android_app;