Adding yaml-cpp for #428, use rando fork until jbeder/yaml-cpp#342 lands.

This commit is contained in:
Ben Vanik 2016-01-01 12:13:36 -08:00
parent 171a10ab9b
commit 8770e6e6cf
8 changed files with 27 additions and 1 deletions

3
.gitmodules vendored
View File

@ -34,3 +34,6 @@
[submodule "testdata/reference-gpu-traces"] [submodule "testdata/reference-gpu-traces"]
path = testdata/reference-gpu-traces path = testdata/reference-gpu-traces
url = https://github.com/xenia-project/reference-gpu-traces.git url = https://github.com/xenia-project/reference-gpu-traces.git
[submodule "third_party/yaml-cpp"]
path = third_party/yaml-cpp
url = https://github.com/blair1618/yaml-cpp.git

View File

@ -170,6 +170,7 @@ solution("xenia")
include("third_party/snappy.lua") include("third_party/snappy.lua")
include("third_party/spirv-tools.lua") include("third_party/spirv-tools.lua")
include("third_party/xxhash.lua") include("third_party/xxhash.lua")
include("third_party/yaml-cpp.lua")
include("src/xenia") include("src/xenia")
include("src/xenia/app") include("src/xenia/app")

View File

@ -19,6 +19,7 @@
#include "third_party/capstone/include/x86.h" #include "third_party/capstone/include/x86.h"
#include "third_party/imgui/imgui.h" #include "third_party/imgui/imgui.h"
#include "third_party/imgui/imgui_internal.h" #include "third_party/imgui/imgui_internal.h"
#include "third_party/yaml-cpp/include/yaml-cpp/yaml.h"
#include "xenia/base/clock.h" #include "xenia/base/clock.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/base/math.h" #include "xenia/base/math.h"

View File

@ -12,10 +12,12 @@ project("xenia-debug-ui")
"xenia-cpu", "xenia-cpu",
"xenia-debug", "xenia-debug",
"xenia-ui", "xenia-ui",
"yaml-cpp",
}) })
defines({ defines({
}) })
includedirs({ includedirs({
project_root.."/third_party/gflags/src", project_root.."/third_party/gflags/src",
project_root.."/third_party/yaml-cpp/include/",
}) })
local_platform_files() local_platform_files()

View File

@ -289,7 +289,7 @@ dword_result_t NtWriteFile(dword_t file_handle, dword_t event_handle,
size_t bytes_written = 0; size_t bytes_written = 0;
result = file->Write( result = file->Write(
buffer, buffer_length, buffer, buffer_length,
byte_offset_ptr ? static_cast<uint32_t>(*byte_offset_ptr) : -1u, byte_offset_ptr ? static_cast<uint32_t>(*byte_offset_ptr) : -1,
&bytes_written, apc_context); &bytes_written, apc_context);
if (XSUCCEEDED(result)) { if (XSUCCEEDED(result)) {
info = (int32_t)bytes_written; info = (int32_t)bytes_written;

1
third_party/yaml-cpp vendored Submodule

@ -0,0 +1 @@
Subproject commit 2eba4e6d5670daea6b75c773f1c3dc9e531ddec7

17
third_party/yaml-cpp.lua vendored Normal file
View File

@ -0,0 +1,17 @@
group("third_party")
project("yaml-cpp")
uuid("47bfe853-a3f8-4902-921d-d564608ff355")
kind("StaticLib")
language("C++")
defines({
"_LIB",
})
includedirs({
"yaml-cpp/include/",
})
recursive_platform_files("yaml-cpp/include/yaml-cpp")
recursive_platform_files("yaml-cpp/src")
filter("platforms:Windows")
warnings("Off") -- Too many warnings.

View File

@ -6,6 +6,7 @@ local function match_platform_files(base_path, base_match)
base_path.."/"..base_match..".h", base_path.."/"..base_match..".h",
base_path.."/"..base_match..".c", base_path.."/"..base_match..".c",
base_path.."/"..base_match..".cc", base_path.."/"..base_match..".cc",
base_path.."/"..base_match..".cpp",
}) })
removefiles({base_path.."/".."**_main.cc"}) removefiles({base_path.."/".."**_main.cc"})
removefiles({base_path.."/".."**_test.cc"}) removefiles({base_path.."/".."**_test.cc"})