claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #337 from xiphos/master

Browse source 
Fixed build failed for _DIRECT2DISPLAY
This commit is contained in:
Sascha Willems 2017-05-26 20:01:35 +02:00 • committed by GitHub
commit 43da238e30
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -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)

6
base/vulkanexamplebase.h
View file

@ -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();