Fixed few Android build problems
assiduous
2 years ago
| 173 | 173 |
if(PLATFORM_WIN32)
|
| 174 | 174 |
set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static opengl32.lib)
|
| 175 | 175 |
elseif(PLATFORM_ANDROID)
|
| 176 | |
set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL android)
|
|
176 |
set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL)
|
| 177 | 177 |
elseif(PLATFORM_LINUX)
|
| 178 | 178 |
set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static GL X11)
|
| 179 | 179 |
elseif(PLATFORM_MACOS)
|
| 39 | 39 |
#include "VulkanUtilities/VulkanPhysicalDevice.hpp"
|
| 40 | 40 |
#include "EngineFactoryBase.hpp"
|
| 41 | 41 |
|
|
42 |
#if PLATFORM_ANDROID
|
|
43 |
# include "FileSystem.hpp"
|
|
44 |
#endif
|
|
45 |
|
| 42 | 46 |
namespace Diligent
|
| 43 | 47 |
{
|
| 44 | 48 |
|
|
| 75 | 79 |
const SwapChainDesc& SwapChainDesc,
|
| 76 | 80 |
const NativeWindow& Window,
|
| 77 | 81 |
ISwapChain** ppSwapChain) override final;
|
|
82 |
|
|
83 |
#if PLATFORM_ANDROID
|
|
84 |
virtual void InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const override final;
|
|
85 |
#endif
|
| 78 | 86 |
|
| 79 | 87 |
private:
|
| 80 | 88 |
std::function<void(RenderDeviceVkImpl*)> OnRenderDeviceCreated = nullptr;
|
|
| 341 | 349 |
}
|
| 342 | 350 |
}
|
| 343 | 351 |
|
|
352 |
#if PLATFORM_ANDROID
|
|
353 |
void EngineFactoryVkImpl::InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const
|
|
354 |
{
|
|
355 |
AndroidFileSystem::Init(Activity, ActivityClassName);
|
|
356 |
}
|
|
357 |
#endif
|
| 344 | 358 |
|
| 345 | 359 |
#ifdef DOXYGEN
|
| 346 | 360 |
/// Loads Direct3D12-based engine implementation and exports factory functions
|
| 25 | 25 |
target_link_libraries(Diligent-AndroidPlatform
|
| 26 | 26 |
PRIVATE
|
| 27 | 27 |
log
|
|
28 |
android
|
| 28 | 29 |
PUBLIC
|
| 29 | 30 |
Diligent-BuildSettings
|
| 30 | 31 |
Diligent-PlatformInterface
|