diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdcf7dd4..ef732d81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 # Debug flags
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Wundef")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
+if(CMAKE_COMPILER_IS_GNUCXX)
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wextra -Wundef")
+endif(CMAKE_COMPILER_IS_GNUCXX)
 
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 add_definitions(-std=c++11)
diff --git a/base/vulkanexamplebase.h b/base/vulkanexamplebase.h
index ad6cbe51..32477f8b 100644
--- a/base/vulkanexamplebase.h
+++ b/base/vulkanexamplebase.h
@@ -21,6 +21,8 @@
 #include "VulkanAndroid.h"
 #elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
 #include <wayland-client.h>
+#elif defined(_DIRECT2DISPLAY)
+//
 #elif defined(__linux__)
 #include <xcb/xcb.h>
 #endif
@@ -223,6 +225,8 @@ public:
 		bool right = false;
 		bool middle = false;
 	} mouseButtons;
+#elif defined(_DIRECT2DISPLAY)
+	bool quit = false;
 #elif defined(__linux__)
 	struct {
 		bool left = false;
@@ -294,6 +298,8 @@ public:
 			uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched,
 			uint32_t mods_locked, uint32_t group);
 
+#elif defined(_DIRECT2DISPLAY)
+//
 #elif defined(__linux__)
 	xcb_window_t setupWindow();
 	void initxcbConnection();