diff options
| author | Jon Ashburn <jon@lunarg.com> | 2016-01-21 10:13:33 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-01-21 10:14:16 -0700 |
| commit | 5ca53291a312c4343d8f25e77136491242daf383 (patch) | |
| tree | 8f8cbeea41c1d6f1c545b9fab2f83f1f67b417c8 /libs | |
| parent | 81f1091306dff8415992e68be6ffc297d3e1e93f (diff) | |
| download | vulkan-validation-layers-5ca53291a312c4343d8f25e77136491242daf383.tar.gz | |
vkjson: Fix windows build
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/vkjson/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | libs/vkjson/vkjson.cc | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libs/vkjson/CMakeLists.txt b/libs/vkjson/CMakeLists.txt index 739ea50ca..2b9c19386 100644 --- a/libs/vkjson/CMakeLists.txt +++ b/libs/vkjson/CMakeLists.txt @@ -29,6 +29,11 @@ if (NOT WIN32) set (CMAKE_CXX_FLAGS "-std=c++11") endif() +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../../loader + ${CMAKE_CURRENT_SOURCE_DIR}/../../include/vulkan + ) add_library(vkjson STATIC vkjson.cc vkjson_device.cc ../../loader/cJSON.c) diff --git a/libs/vkjson/vkjson.cc b/libs/vkjson/vkjson.cc index de4461338..33395ead4 100644 --- a/libs/vkjson/vkjson.cc +++ b/libs/vkjson/vkjson.cc @@ -40,7 +40,8 @@ #include <type_traits> #include <utility> -#include "../../loader/cJSON.h" +#include "cJSON.h" +#include "vk_sdk_platform.h" namespace { @@ -368,7 +369,7 @@ inline cJSON* ToJsonValue(const T& value) { inline cJSON* ToJsonValue(const uint64_t& value) { char string[19] = {0}; // "0x" + 16 digits + terminal \0 - std::snprintf(string, sizeof(string), "0x%016" PRIx64, value); + snprintf(string, sizeof(string), "0x%016" PRIx64, value); return cJSON_CreateString(string); } |