summaryrefslogtreecommitdiffstats
path: root/NativeApp
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2019-12-29 04:59:54 +0000
committerassiduous <assiduous@diligentgraphics.com>2019-12-29 04:59:54 +0000
commitcba8039c09d5934a5732ebfc8bc9a7765b1c35b1 (patch)
treeed558a0cf4bf5ff50e5dc7f32014bbb5fa16c0fa /NativeApp
parentImGuiImplDiligent: added EndFrame method (diff)
downloadDiligentTools-cba8039c09d5934a5732ebfc8bc9a7765b1c35b1.tar.gz
DiligentTools-cba8039c09d5934a5732ebfc8bc9a7765b1c35b1.zip
Fixed few linux build issues
Diffstat (limited to 'NativeApp')
-rw-r--r--NativeApp/include/Linux/LinuxAppBase.h3
-rw-r--r--NativeApp/src/Linux/LinuxMain.cpp2
2 files changed, 5 insertions, 0 deletions
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 <xcb/xcb.h>
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: