diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-29 16:56:59 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-29 16:56:59 +0000 |
| commit | c6ebeeb0fb6a9c57fd336aad16fcdc0b597e50b7 (patch) | |
| tree | 764651f4fdebd14fb1e5758da663e65690641ab8 /NativeApp | |
| parent | Updates to comply with the new API (diff) | |
| download | DiligentTools-c6ebeeb0fb6a9c57fd336aad16fcdc0b597e50b7.tar.gz DiligentTools-c6ebeeb0fb6a9c57fd336aad16fcdc0b597e50b7.zip | |
Fixed a bunch of minor Linux/iOS/MacOS build issues
Diffstat (limited to 'NativeApp')
| -rw-r--r-- | NativeApp/Apple/Source/Classes/iOS/EAGLView.m | 2 | ||||
| -rw-r--r-- | NativeApp/Apple/Source/Classes/iOS/MetalView.m | 2 | ||||
| -rw-r--r-- | NativeApp/include/IOS/IOSAppBase.h | 2 | ||||
| -rw-r--r-- | NativeApp/include/MacOS/MacOSAppBase.h | 2 | ||||
| -rw-r--r-- | NativeApp/src/Android/AndroidAppBase.cpp | 2 | ||||
| -rw-r--r-- | NativeApp/src/Linux/LinuxMain.cpp | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/NativeApp/Apple/Source/Classes/iOS/EAGLView.m b/NativeApp/Apple/Source/Classes/iOS/EAGLView.m index ff02820..930c7e2 100644 --- a/NativeApp/Apple/Source/Classes/iOS/EAGLView.m +++ b/NativeApp/Apple/Source/Classes/iOS/EAGLView.m @@ -43,7 +43,7 @@ return nil; } - [self initApp:(int)Diligent::DeviceType::OpenGLES]; + [self initApp:(int)Diligent::RENDER_DEVICE_TYPE_GLES]; } return self; diff --git a/NativeApp/Apple/Source/Classes/iOS/MetalView.m b/NativeApp/Apple/Source/Classes/iOS/MetalView.m index 67c2a27..4a805af 100644 --- a/NativeApp/Apple/Source/Classes/iOS/MetalView.m +++ b/NativeApp/Apple/Source/Classes/iOS/MetalView.m @@ -19,7 +19,7 @@ { if ((self = [super initWithCoder:coder])) { - [self initApp:(int)Diligent::DeviceType::Vulkan]; + [self initApp:(int)Diligent::RENDER_DEVICE_TYPE_VULKAN]; } return self; diff --git a/NativeApp/include/IOS/IOSAppBase.h b/NativeApp/include/IOS/IOSAppBase.h index a49aadb..c7def32 100644 --- a/NativeApp/include/IOS/IOSAppBase.h +++ b/NativeApp/include/IOS/IOSAppBase.h @@ -24,7 +24,7 @@ #pragma once #include "AppBase.h" -#include "Timer.h" +#include "Timer.hpp" namespace Diligent { diff --git a/NativeApp/include/MacOS/MacOSAppBase.h b/NativeApp/include/MacOS/MacOSAppBase.h index 3a0e5b0..34bc47c 100644 --- a/NativeApp/include/MacOS/MacOSAppBase.h +++ b/NativeApp/include/MacOS/MacOSAppBase.h @@ -24,7 +24,7 @@ #pragma once #include "AppBase.h" -#include "Timer.h" +#include "Timer.hpp" namespace Diligent { diff --git a/NativeApp/src/Android/AndroidAppBase.cpp b/NativeApp/src/Android/AndroidAppBase.cpp index 05386fd..5c21dc6 100644 --- a/NativeApp/src/Android/AndroidAppBase.cpp +++ b/NativeApp/src/Android/AndroidAppBase.cpp @@ -22,7 +22,7 @@ */ #include "AndroidAppBase.h" -#include "Timer.h" +#include "Timer.hpp" #include <android/sensor.h> //#include <android/log.h> diff --git a/NativeApp/src/Linux/LinuxMain.cpp b/NativeApp/src/Linux/LinuxMain.cpp index dec0c92..ca4a8cd 100644 --- a/NativeApp/src/Linux/LinuxMain.cpp +++ b/NativeApp/src/Linux/LinuxMain.cpp @@ -26,9 +26,9 @@ #include "PlatformDefinitions.h" #include "NativeAppBase.h" -#include "StringTools.h" -#include "Timer.h" -#include "Errors.h" +#include "StringTools.hpp" +#include "Timer.hpp" +#include "Errors.hpp" #ifndef GLX_CONTEXT_MAJOR_VERSION_ARB |