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 /unityplugin/UnityEmulator | |
| 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 'unityplugin/UnityEmulator')
| -rw-r--r-- | unityplugin/UnityEmulator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
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(); |