From 32d3dbd559acb8d4d7a4a8cfaaef1a05330606bb Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Sun, 19 Apr 2020 09:33:01 -0700
Subject: Fixed few Android build problems

---
 Graphics/GraphicsEngineOpenGL/CMakeLists.txt          |  2 +-
 Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'Graphics')

diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
index 3097c7fc..39d771e5 100644
--- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
+++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
@@ -174,7 +174,7 @@ set(PUBLIC_DEPENDENCIES
 if(PLATFORM_WIN32)
     set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static opengl32.lib)
 elseif(PLATFORM_ANDROID)
-    set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL android)
+    set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL)
 elseif(PLATFORM_LINUX)
     set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static GL X11)
 elseif(PLATFORM_MACOS)
diff --git a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp
index f695b372..7663eb85 100644
--- a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp
@@ -40,6 +40,10 @@
 #include "VulkanUtilities/VulkanPhysicalDevice.hpp"
 #include "EngineFactoryBase.hpp"
 
+#if PLATFORM_ANDROID
+#    include "FileSystem.hpp"
+#endif
+
 namespace Diligent
 {
 
@@ -77,6 +81,10 @@ public:
                                                       const NativeWindow&  Window,
                                                       ISwapChain**         ppSwapChain) override final;
 
+#if PLATFORM_ANDROID
+    virtual void InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const override final;
+#endif
+
 private:
     std::function<void(RenderDeviceVkImpl*)> OnRenderDeviceCreated = nullptr;
 };
@@ -342,6 +350,12 @@ void EngineFactoryVkImpl::CreateSwapChainVk(IRenderDevice*       pDevice,
     }
 }
 
+#if PLATFORM_ANDROID
+void EngineFactoryVkImpl::InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const
+{
+    AndroidFileSystem::Init(Activity, ActivityClassName);
+}
+#endif
 
 #ifdef DOXYGEN
 /// Loads Direct3D12-based engine implementation and exports factory functions
-- 
cgit v1.2.3