diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-31 02:53:37 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-31 02:53:37 +0000 |
| commit | 0b9541f681f248762388be82149689df35fa632c (patch) | |
| tree | 320b0ea38b94bc662fb110f5ee52d19c1f26c293 /Graphics/GraphicsEngineOpenGL | |
| parent | Improved shader conversion custom CMake commands to properly detect changes a... (diff) | |
| download | DiligentCore-0b9541f681f248762388be82149689df35fa632c.tar.gz DiligentCore-0b9541f681f248762388be82149689df35fa632c.zip | |
Fixed Android build problems
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLESImpl.hpp (renamed from Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLESImpl.h) | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp | 3 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLESImpl.cpp | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt index bb43533f..d118a30c 100644 --- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt +++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt @@ -100,7 +100,7 @@ elseif(PLATFORM_ANDROID) list(APPEND INCLUDE include/GLContextAndroid.hpp) list(APPEND INCLUDE include/GLStubsAndroid.h) - list(APPEND INCLUDE include/RenderDeviceGLESImpl.h) + list(APPEND INCLUDE include/RenderDeviceGLESImpl.hpp) list(APPEND INCLUDE include/SwapChainGLImpl.hpp) list(APPEND INTERFACE interface/RenderDeviceGLES.h) diff --git a/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h b/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h index 2a09d40c..d90ecfd1 100644 --- a/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h +++ b/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h @@ -23,7 +23,7 @@ #pragma once -#include "Errors.h" +#include "Errors.hpp" // clang-format off diff --git a/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLESImpl.h b/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLESImpl.hpp index 7971b979..fc0aa57f 100644 --- a/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLESImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLESImpl.hpp @@ -23,7 +23,7 @@ #pragma once -#include "RenderDeviceGLImpl.h" +#include "RenderDeviceGLImpl.hpp" namespace Diligent { diff --git a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp index 5faf3f47..7566a6ce 100644 --- a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp @@ -43,8 +43,9 @@ #endif #if PLATFORM_ANDROID -# include "RenderDeviceGLESImpl.h" +# include "RenderDeviceGLESImpl.hpp" # include "FileStream.h" +# include "FileSystem.hpp" #endif namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLESImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLESImpl.cpp index e18d4201..10a0033a 100644 --- a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLESImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLESImpl.cpp @@ -23,7 +23,7 @@ #include "pch.h" -#include "RenderDeviceGLESImpl.h" +#include "RenderDeviceGLESImpl.hpp" namespace Diligent { |