From 4aa863896e656325e707e20cfe29c6401f9576d6 Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 10 May 2019 20:41:00 -0700 Subject: Fixed android build; moved NDKHelper from Core module to NativeAppCommon --- unityplugin/UnityEmulator/CMakeLists.txt | 2 +- unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'unityplugin/UnityEmulator') diff --git a/unityplugin/UnityEmulator/CMakeLists.txt b/unityplugin/UnityEmulator/CMakeLists.txt index 3e1d940..9fe7ca2 100644 --- a/unityplugin/UnityEmulator/CMakeLists.txt +++ b/unityplugin/UnityEmulator/CMakeLists.txt @@ -161,7 +161,7 @@ endif() if(PLATFORM_UNIVERSAL_WINDOWS) target_link_libraries(UnityEmulator PRIVATE dxguid.lib) elseif(PLATFORM_ANDROID) - target_link_libraries(UnityEmulator PRIVATE NDKHelper GLESv3 android PUBLIC NativeAppGlue) + target_link_libraries(UnityEmulator PRIVATE NDKHelper GLESv3 android PUBLIC native_app_glue) target_include_directories(UnityEmulator PRIVATE ${ANDROID_NDK}/sources/android/cpufeatures ) diff --git a/unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp b/unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp index cdff820..dc6aba6 100644 --- a/unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp +++ b/unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp @@ -35,10 +35,10 @@ public: m_DeviceType = Diligent::DeviceType::OpenGLES; } - virtual void Initialize(ANativeWindow* window)override final + virtual void Initialize()override final { - UnityAppBase::Initialize(window); - InitGraphics(window, 0/*Unused*/, 0/*Unused*/); + UnityAppBase::Initialize(); + InitGraphics(app_->window, 0/*Unused*/, 0/*Unused*/); InitScene(); } @@ -46,7 +46,7 @@ public: { return ((UnityGraphicsGLCoreES_Emulator*)m_GraphicsEmulator)->GetGraphicsImpl()->Resume( window ); } - + virtual void TermDisplay()override final { ((UnityGraphicsGLCoreES_Emulator*)m_GraphicsEmulator)->GetGraphicsImpl()->Suspend(); -- cgit v1.2.3