diff options
| author | Egor <egor.yusov@gmail.com> | 2019-05-11 03:41:00 +0000 |
|---|---|---|
| committer | Egor <egor.yusov@gmail.com> | 2019-05-11 03:41:00 +0000 |
| commit | 4aa863896e656325e707e20cfe29c6401f9576d6 (patch) | |
| tree | 9d76bac7883474302cc9a1875d68e5273e098c5d /Tests/TestApp/src | |
| parent | Updated cmd line args for ghost cube scene in VS code launch.json (diff) | |
| download | DiligentEngine-4aa863896e656325e707e20cfe29c6401f9576d6.tar.gz DiligentEngine-4aa863896e656325e707e20cfe29c6401f9576d6.zip | |
Fixed android build; moved NDKHelper from Core module to NativeAppCommon
Diffstat (limited to 'Tests/TestApp/src')
| -rw-r--r-- | Tests/TestApp/src/Android/TestAppAndroid.cpp | 10 | ||||
| -rw-r--r-- | Tests/TestApp/src/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Tests/TestApp/src/Android/TestAppAndroid.cpp b/Tests/TestApp/src/Android/TestAppAndroid.cpp index fe1c86a..0563cab 100644 --- a/Tests/TestApp/src/Android/TestAppAndroid.cpp +++ b/Tests/TestApp/src/Android/TestAppAndroid.cpp @@ -21,6 +21,8 @@ * of the possibility of such damages. */ +#include "AndroidFileSystem.h" +#include "EngineFactoryOpenGL.h" #include "TestApp.h" #include "RenderDeviceGLES.h" @@ -35,10 +37,12 @@ public: m_DeviceType = DeviceType::OpenGLES; } - virtual void Initialize(ANativeWindow* window)override final + virtual void Initialize()override final { - TestApp::Initialize(window); - InitializeDiligentEngine(window); + GetEngineFactoryOpenGL()->InitAndroidFileSystem(app_->activity, native_activity_class_name_.c_str()); + AndroidFileSystem::Init(app_->activity, native_activity_class_name_.c_str()); + TestApp::Initialize(); + InitializeDiligentEngine(app_->window); m_RenderDeviceGLES = RefCntAutoPtr<IRenderDeviceGLES>(m_pDevice, IID_RenderDeviceGLES); InitializeRenderers(); } diff --git a/Tests/TestApp/src/CMakeLists.txt b/Tests/TestApp/src/CMakeLists.txt index 1de4d2a..befa6fa 100644 --- a/Tests/TestApp/src/CMakeLists.txt +++ b/Tests/TestApp/src/CMakeLists.txt @@ -128,7 +128,7 @@ PUBLIC if(PLATFORM_UNIVERSAL_WINDOWS) target_link_libraries(TestApp PRIVATE dxguid.lib) elseif(PLATFORM_ANDROID) - target_link_libraries(TestApp PRIVATE GLESv3 PUBLIC NativeAppGlue) + target_link_libraries(TestApp PRIVATE GLESv3 PUBLIC native_app_glue) elseif(PLATFORM_LINUX) target_link_libraries(TestApp PRIVATE GL X11) elseif(PLATFORM_MACOS OR PLATFORM_IOS) |