From cba8039c09d5934a5732ebfc8bc9a7765b1c35b1 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sat, 28 Dec 2019 20:59:54 -0800 Subject: Fixed few linux build issues --- NativeApp/include/Linux/LinuxAppBase.h | 3 +++ NativeApp/src/Linux/LinuxMain.cpp | 2 ++ 2 files changed, 5 insertions(+) (limited to 'NativeApp') diff --git a/NativeApp/include/Linux/LinuxAppBase.h b/NativeApp/include/Linux/LinuxAppBase.h index eb900f7..3d98606 100644 --- a/NativeApp/include/Linux/LinuxAppBase.h +++ b/NativeApp/include/Linux/LinuxAppBase.h @@ -37,6 +37,9 @@ #ifdef False # undef False #endif +#ifdef None +# undef None +#endif #if VULKAN_SUPPORTED # include diff --git a/NativeApp/src/Linux/LinuxMain.cpp b/NativeApp/src/Linux/LinuxMain.cpp index b06c14e..684493f 100644 --- a/NativeApp/src/Linux/LinuxMain.cpp +++ b/NativeApp/src/Linux/LinuxMain.cpp @@ -59,6 +59,8 @@ using namespace Diligent; namespace { +static constexpr int None = 0; + class WindowTitleHelper { public: -- cgit v1.2.3