diff --git a/android/Android.mk b/android/Android.mk index 85ea4aed5..67fddb84d 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -126,7 +126,7 @@ LOCAL_PATH := . LOCAL_CPP_FEATURES += rtti LOCAL_SRC_FILES := $(wildcard ../lib/irrlicht/source/Irrlicht/*.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/ \ -I../lib/irrlicht/include/ \ -Iobj/jpeglib/ \ diff --git a/lib/irrlicht/source/Irrlicht/CContextEGL.cpp b/lib/irrlicht/source/Irrlicht/CContextEGL.cpp index 23764081e..81645bad8 100644 --- a/lib/irrlicht/source/Irrlicht/CContextEGL.cpp +++ b/lib/irrlicht/source/Irrlicht/CContextEGL.cpp @@ -25,7 +25,7 @@ #include #ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_ -#include +#include "stk_android_native_app_glue.h" #endif #include "CContextEGL.h" diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.h b/lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.h index 1622ff2bd..3c56b934e 100644 --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.h +++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.h @@ -12,7 +12,7 @@ #include #include -#include +#include "stk_android_native_app_glue.h" #include "CIrrDeviceStub.h" #include "IrrlichtDevice.h" #include "IImagePresenter.h" diff --git a/lib/irrlicht/source/Irrlicht/COGLES2Driver.h b/lib/irrlicht/source/Irrlicht/COGLES2Driver.h index cca8439e2..8329080c4 100644 --- a/lib/irrlicht/source/Irrlicht/COGLES2Driver.h +++ b/lib/irrlicht/source/Irrlicht/COGLES2Driver.h @@ -27,7 +27,7 @@ #include #elif defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) #include -#include "android_native_app_glue.h" +#include "stk_android_native_app_glue.h" #endif #include "CNullDriver.h" diff --git a/lib/irrlicht/source/Irrlicht/android_native_app_glue.c b/lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.c similarity index 99% rename from lib/irrlicht/source/Irrlicht/android_native_app_glue.c rename to lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.c index 01273dc85..6d4be1080 100644 --- a/lib/irrlicht/source/Irrlicht/android_native_app_glue.c +++ b/lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.c @@ -24,7 +24,7 @@ #include #include -#include "android_native_app_glue.h" +#include "stk_android_native_app_glue.h" #include #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "threaded_app", __VA_ARGS__)) diff --git a/lib/irrlicht/source/Irrlicht/android_native_app_glue.h b/lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.h similarity index 100% rename from lib/irrlicht/source/Irrlicht/android_native_app_glue.h rename to lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.h diff --git a/src/guiengine/event_handler.cpp b/src/guiengine/event_handler.cpp index f2e3029f2..2dc59bbf1 100644 --- a/src/guiengine/event_handler.cpp +++ b/src/guiengine/event_handler.cpp @@ -44,7 +44,7 @@ #include #ifdef ANDROID -#include +#include "../../../lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.h" #endif using GUIEngine::EventHandler; diff --git a/src/main_android.hpp b/src/main_android.hpp index 5782bff89..f3d62ad88 100644 --- a/src/main_android.hpp +++ b/src/main_android.hpp @@ -20,7 +20,7 @@ #ifdef ANDROID -#include +#include "../../../lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.h" extern struct android_app* global_android_app;