git.s-ol.nu forks/DiligentCore / 32d3dbd
Fixed few Android build problems assiduous 2 years ago
3 changed file(s) with 16 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
173173 if(PLATFORM_WIN32)
174174 set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static opengl32.lib)
175175 elseif(PLATFORM_ANDROID)
176 set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL android)
176 set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL)
177177 elseif(PLATFORM_LINUX)
178178 set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static GL X11)
179179 elseif(PLATFORM_MACOS)
3939 #include "VulkanUtilities/VulkanPhysicalDevice.hpp"
4040 #include "EngineFactoryBase.hpp"
4141
42 #if PLATFORM_ANDROID
43 # include "FileSystem.hpp"
44 #endif
45
4246 namespace Diligent
4347 {
4448
7579 const SwapChainDesc& SwapChainDesc,
7680 const NativeWindow& Window,
7781 ISwapChain** ppSwapChain) override final;
82
83 #if PLATFORM_ANDROID
84 virtual void InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const override final;
85 #endif
7886
7987 private:
8088 std::function<void(RenderDeviceVkImpl*)> OnRenderDeviceCreated = nullptr;
341349 }
342350 }
343351
352 #if PLATFORM_ANDROID
353 void EngineFactoryVkImpl::InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const
354 {
355 AndroidFileSystem::Init(Activity, ActivityClassName);
356 }
357 #endif
344358
345359 #ifdef DOXYGEN
346360 /// Loads Direct3D12-based engine implementation and exports factory functions
2525 target_link_libraries(Diligent-AndroidPlatform
2626 PRIVATE
2727 log
28 android
2829 PUBLIC
2930 Diligent-BuildSettings
3031 Diligent-PlatformInterface