diff options
| author | Egor <egor.yusov@gmail.com> | 2018-02-10 19:56:36 +0000 |
|---|---|---|
| committer | Egor <egor.yusov@gmail.com> | 2018-02-10 19:56:36 +0000 |
| commit | d823930b20c37f92073791e18f9e6a744dc34d51 (patch) | |
| tree | 25d8dda1c46a05cd651af4818dd2ba20e44f47eb /Common/NativeApp/include | |
| parent | Reworked win32 and uwp cmake build rules (diff) | |
| download | DiligentEngine-d823930b20c37f92073791e18f9e6a744dc34d51.tar.gz DiligentEngine-d823930b20c37f92073791e18f9e6a744dc34d51.zip | |
Fixed linux build
Diffstat (limited to 'Common/NativeApp/include')
| -rw-r--r-- | Common/NativeApp/include/AppBase.h | 2 | ||||
| -rw-r--r-- | Common/NativeApp/include/Linux/LinuxAppBase.h | 48 | ||||
| -rw-r--r-- | Common/NativeApp/include/NativeAppBase.h | 9 |
3 files changed, 56 insertions, 3 deletions
diff --git a/Common/NativeApp/include/AppBase.h b/Common/NativeApp/include/AppBase.h index e6641b1..418c0e4 100644 --- a/Common/NativeApp/include/AppBase.h +++ b/Common/NativeApp/include/AppBase.h @@ -33,6 +33,6 @@ public: virtual void Update(double CurrTime, double ElapsedTime) {}; virtual void Render() = 0; virtual void Present() = 0; - virtual void Resize(int width, int height) = 0; + virtual void WindowResize(int width, int height) = 0; }; diff --git a/Common/NativeApp/include/Linux/LinuxAppBase.h b/Common/NativeApp/include/Linux/LinuxAppBase.h new file mode 100644 index 0000000..5a3e7ef --- /dev/null +++ b/Common/NativeApp/include/Linux/LinuxAppBase.h @@ -0,0 +1,48 @@ +/* Copyright 2015-2018 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + + +#include <GL/glx.h> +#include <GL/gl.h> + +// Undef symbols defined by XLib +#ifdef Bool +# undef Bool +#endif +#ifdef True +# undef True +#endif +#ifdef False +# undef False +#endif + +#include "AppBase.h" + +class LinuxAppBase : public AppBase +{ +public: + virtual void OnGLContextCreated(Display* display, Window window) = 0; + virtual int HandleXEvent(XEvent *xev){} +}; diff --git a/Common/NativeApp/include/NativeAppBase.h b/Common/NativeApp/include/NativeAppBase.h index 6ffbb74..222dd8d 100644 --- a/Common/NativeApp/include/NativeAppBase.h +++ b/Common/NativeApp/include/NativeAppBase.h @@ -22,16 +22,21 @@ */ #pragma once -#if defined(PLATFORM_WIN32) +#if PLATFORM_WIN32 #include "Win32AppBase.h" using NativeAppBase = Win32AppBase; -#elif defined(PLATFORM_UNIVERSAL_WINDOWS) +#elif PLATFORM_UNIVERSAL_WINDOWS #include "UWPAppBase.h" using NativeAppBase = UWPAppBase; +#elif PLATFORM_LINUX + + #include "LinuxAppBase.h" + using NativeAppBase = LinuxAppBase; + #else # error Usnupported paltform |
